Skip to content

Commit eb11bf7

Browse files
Robert Di PardoRobert Di Pardo
authored andcommitted
Remove ANSI code paths
These were intended for 32-bit Notepad++ "up to and including version 5.0.3" (*), which hasn't been supported since HTML Tag v0.4 --- (*) https://fossil.2of4.net/npp_htmltag/doc/trunk/doc/HTMLTag-readme.txt
1 parent 3932513 commit eb11bf7

4 files changed

Lines changed: 1 addition & 20 deletions

File tree

src/Include/Npp.inc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,15 +403,9 @@ const
403403

404404

405405
type
406-
{$IFDEF NPPUNICODE}
407406
nppString = UnicodeString;
408407
nppChar = WChar;
409408
nppPChar = PWChar;
410-
{$ELSE}
411-
nppString = AnsiString;
412-
nppChar = AnsiChar;
413-
nppPChar = PAnsiChar;
414-
{$ENDIF}
415409

416410
LangType = (L_TXT = 0, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,
417411
L_HTML, L_XML, L_MAKEFILE, L_PASCAL, L_BATCH, L_INI, L_NFO, L_USER,

src/Include/NppPluginInclude.pas

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,10 @@ function messageProc(msg: Integer; _wParam: WPARAM; _lParam: LPARAM): LRESULT; c
6969
Result := xmsg.Result;
7070
end;
7171

72-
{$IFDEF NPPUNICODE}
7372
function isUnicode : Boolean; cdecl; export;
7473
begin
7574
Result := true;
7675
end;
77-
{$ENDIF}
7876

7977
exports
80-
setInfo, getName, getFuncsArray, beNotified, messageProc;
81-
{$IFDEF NPPUNICODE}
82-
exports
83-
isUnicode;
84-
{$ENDIF}
78+
setInfo, getName, getFuncsArray, beNotified, messageProc, isUnicode;

src/LibNppPlugin/NppSimpleObjects.pas

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,12 +467,8 @@ procedure TTextRange.Mark(const Style: integer; const DurationInMs: cardinal);
467467
{ ------------------------------------------------------------------------------------------------ }
468468
procedure TTextRange.Select;
469469
begin
470-
{$IFDEF NPPUNICODE}
471470
FEditor.SendMessage(SCI_SETSELECTION, FEndPos, FStartPos);
472471
FEditor.SendMessage(SCI_SCROLLCARET);
473-
{$ELSE}
474-
FEditor.SendMessage(SCI_SETSEL, FStartPos, FEndPos);
475-
{$ENDIF}
476472
end;
477473

478474
{ ================================================================================================ }

src/prj/HTMLTag.lpi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,11 @@
6969
</Linking>
7070
<Other>
7171
<CustomOptions Value="-dUNICODE
72-
-dNPPUNICODE
7372
-dSCI_DISABLE_PROVISIONAL
7473
-FcUTF8
7574
-vm2026,4104,5024"/>
7675
<OtherDefines Count="2">
7776
<Define0 Value="UNICODE"/>
78-
<Define1 Value="NPPUNICODE"/>
7977
</OtherDefines>
8078
<ExecuteAfter>
8179
<Command Value="&quot;C:\Users\Rob\scoop\apps\upx\current\upx.exe&quot; --best -q &quot;$TargetFile()&quot;"/>
@@ -177,7 +175,6 @@
177175
</Linking>
178176
<Other>
179177
<CustomOptions Value="-dUNICODE
180-
-dNPPUNICODE
181178
-FcUTF8
182179
-dSCI_DISABLE_PROVISIONAL
183180
-WN

0 commit comments

Comments
 (0)