paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-03 01:09:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moves the selection of cwstring vs paswstring vs windows string manager into the widgetsets

Browse Source 
git-svn-id: trunk@33921 -
This commit is contained in:
sekelsenmat 2011-12-02 23:00:48 +00:00
parent 7ef858f2db
commit a806fac460
8 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/include/lcl_defines.inc
View File

@ -1,15 +1,3 @@
// Add defines here. This file should be included in all LCL units headers
{$define UseCLDefault}
// For Android, otherwise the LCL will dependent on libc
{$IF defined(Android)}//defined(CPUARM) and defined(LINUX)}
{$DEFINE DisableCWString}
{$DEFINE DisableIconv}
// This IFNDEF Windows is for people that hard-code -dAndroid in their LCLBase package,
// lets not enable paswstring when compiling for Windows, so we don't need
// to keep changing defines to switch between Windows and Android
{$IFNDEF Windows}
{$DEFINE EnablePasWString}
{$ENDIF}
{$ENDIF}

1
lcl/interfaces/carbon/interfaces.pas
View File

@ -32,6 +32,7 @@ unit Interfaces;
interface
uses
{$IFNDEF DisableCWString}cwstring,{$ENDIF}
InterfaceBase;
implementation

1
lcl/interfaces/cocoa/interfaces.pas
View File

@ -32,6 +32,7 @@ unit Interfaces;
interface
uses
{$IFNDEF DisableCWString}cwstring,{$ENDIF}
InterfaceBase;
implementation

1
lcl/interfaces/customdrawn/interfaces.pas
View File

@ -29,6 +29,7 @@ unit Interfaces;
interface
uses
paswstring,
InterfaceBase;
implementation

1
lcl/interfaces/gtk2/interfaces.pas
View File

@ -28,6 +28,7 @@ unit Interfaces;
interface
uses
{$IFDEF UNIX}{$IFNDEF DisableCWString}cwstring,{$ENDIF}{$ENDIF}
InterfaceBase;
implementation

1
lcl/interfaces/qt/interfaces.pp
View File

@ -30,6 +30,7 @@ unit interfaces;
interface
uses
{$IFDEF UNIX}{$IFNDEF DisableCWString}cwstring,{$ENDIF}{$ENDIF}
InterfaceBase;
implementation

5
lcl/lclproc.pas
View File

@ -33,10 +33,7 @@ interface
uses
{$IFDEF Darwin}MacOSAll, {$ENDIF}
Classes, SysUtils, Math, TypInfo, Types, FPCAdds, AvgLvlTree, FileUtil,
LCLStrConsts, LCLType, WSReferences, LazMethodList, LazUTF8
{$IFDEF EnablePasWString}, paswstring{$ENDIF}
{$IFNDEF DisableCWString}{$ifdef unix}{$ifndef DisableIconv}, cwstring{$endif}{$endif}{$ENDIF}
;
LCLStrConsts, LCLType, WSReferences, LazMethodList, LazUTF8;
type
TMethodList = LazMethodList.TMethodList;

3
lcl/translations.pas
View File

@ -70,8 +70,7 @@ unit Translations;
interface
uses
Classes, SysUtils, LCLProc, FileUtil, StringHashList, LConvEncoding
{$IFDEF UNIX}{$IFNDEF DisableCWString}, cwstring{$ENDIF}{$ENDIF};
Classes, SysUtils, LCLProc, FileUtil, StringHashList, LConvEncoding;
type
TStringsType = (stLrt, stRst);