* PChar -> PAnsiChar

packages/fpgtk/examples/lister.pp

@@ -607,7 +607,7 @@ end;
 
 { List }
 
-const ListSignalNames : array[0..15] of string =
+const ListSignalNames : array[0..15] of AnsiString =
         (sgSelectionChanged,sgSelectChild,sgUnselectChild,
          sgToggleFocusRow,sgSelectAll,sgUnselectAll,sgUndoSelection,
          sgStartSelection,sgEndSelection,sgToggleAddMode,

packages/fpgtk/src/def/objectdef.pp

@@ -48,21 +48,21 @@ type
 
   TParameterItem = class (TCollectionItem)
   private
-    FName : string;
+    FName : AnsiString;
     FConvert: boolean;
-    FpascalType: string;
+    FpascalType: AnsiString;
     FParamType: TParamType;
   protected
-    function GetDisplayName : string; override;
-    procedure SetDisplayName(Const Value : string); override;
+    function GetDisplayName : AnsiString; override;
+    procedure SetDisplayName(Const Value : AnsiString); override;
     procedure AssignTo(Dest: TPersistent); override;
   public
     constructor Create (ACollection : TCollection); override;
     destructor destroy; override;
   published
-    property Name : string read FName write FName;
+    property Name : AnsiString read FName write FName;
     { De naam van de parameter }
-    property PascalType : string read FpascalType write FPascalType;
+    property PascalType : AnsiString read FpascalType write FPascalType;
     { Zijn type }
     property Convert : boolean read FConvert write FConvert default false;
     { geeft aan of er een omzetting dient te gebeuren voor het gebruiken }
@@ -86,14 +86,14 @@ type
   TPropertyItem = class (TCollectionItem)
   private
     FPropType : TPropType;
-    FName: string;
+    FName: AnsiString;
     FSection: TInterfaceSection;
-    FPascalType: string;
+    FPascalType: AnsiString;
     FParameters: TParamCollection;
-    FGtkName: string;
+    FGtkName: AnsiString;
     FWriteProcType: TpropFuncType;
     FReadFuncType: TPropFuncType;
-    FWriteGtkName: string;
+    FWriteGtkName: AnsiString;
     FCode: TStringList;
     FWriteCode: TStringList;
     FProctypes: TProcTypeSet;
@@ -103,8 +103,8 @@ type
     procedure SetWriteCode(const Value: TStringList);
     procedure SetPropType(const Value: TPropType);
   protected
-    function GetDisplayName: string; override;
-    procedure SetDisplayName(const Value: string); override;
+    function GetDisplayName: AnsiString; override;
+    procedure SetDisplayName(const Value: AnsiString); override;
     procedure AssignTo(Dest: TPersistent); override;
   public
     constructor create (ACollection : TCollection); override;
@@ -112,15 +112,15 @@ type
   published
     property PropType : TPropType read FPropType write SetPropType default ptProcedure;
     { wat voor iets het is } // Moet voor DisplayName staan voor goede inleesvolgorde
-    property Name : string read FName write FName;
+    property Name : AnsiString read FName write FName;
     { Naam van de property/functie/proc/veld/... }
     property Section : TInterfaceSection read FSection write FSection default isPublic;
     { waar het geplaats moet worden private, public, ... }
-    property PascalType : string read FPascalType write FPascalType;
+    property PascalType : AnsiString read FPascalType write FPascalType;
     { het type van property, functie, veld, signal (moet dan wel gedefinieerd zijn) }
     property Parameters : TParamCollection read FParameters write FParameters;
     { de parameters die doorgegeven moeten worden via de functie/procedure/signaltype }
-    property GtkName : string read FGtkName write FGtkName;
+    property GtkName : AnsiString read FGtkName write FGtkName;
     { de naam zoals GTK die gebruikt (waarschijnlijk met _ in) }
     property Code : TStringList read FCode write SetCode;
   { Property specifiek }
@@ -133,7 +133,7 @@ type
     { Geeft aan of de waarde voor toekenning aan result moet omgezet worden }
     property WriteProcType : TpropFuncType read FWriteProcType write FWriteProcType default pftGtkFunc;
     { hoe de write functie moet werken : gtk-proc, object-veld, object-proc, eigen proc }
-    property WriteGtkName : string read FWriteGtkName write FWriteGtkName;
+    property WriteGtkName : AnsiString read FWriteGtkName write FWriteGtkName;
     { de naam zoals gtk of object die gebruikt. Gebruikt in write, voor read zie GtkName }
     property WriteConvert : boolean read FWriteConvert write FWriteConvert default false;
     { Geeft aan of de waarde moet omgezet worden voor het doorgeven }
@@ -158,31 +158,31 @@ type
 
   TObjectItem = class (TCollectionItem)
   private
-    FInherit: string;
-    FName: string;
+    FInherit: AnsiString;
+    FName: AnsiString;
     FProps: TPropertyCollection;
-    FGtkFuncName: string;
+    FGtkFuncName: AnsiString;
     FWithPointer: boolean;
     FCreateObject: boolean;
-    FGtkName: string;
-    FCreateParams: string;
+    FGtkName: AnsiString;
+    FCreateParams: AnsiString;
     procedure SetProps(const Value: TPropertyCollection);
-    procedure SetGtkFuncName(const Value: string);
+    procedure SetGtkFuncName(const Value: AnsiString);
   protected
-    function GetDisplayName: string; override;
-    procedure SetDisplayName(const Value: string); override;
+    function GetDisplayName: AnsiString; override;
+    procedure SetDisplayName(const Value: AnsiString); override;
     procedure AssignTo(Dest: TPersistent); override;
   public
     constructor create (ACollection : TCollection); override;
     destructor destroy; override;
   published
-    property Name : string read FName write FName;
+    property Name : AnsiString read FName write FName;
     { Naam van het object }
-    property Inherit : string read FInherit write FInherit;
+    property Inherit : AnsiString read FInherit write FInherit;
     { De naam van het object dat ancester is }
-    property GtkFuncName : string read FGtkFuncName write SetGtkFuncName;
+    property GtkFuncName : AnsiString read FGtkFuncName write SetGtkFuncName;
     { Naam van het object in gtk zoals het in de functies en procedures gebruikt wordt }
-    property GtkName : string read FGtkName write FGtkName;
+    property GtkName : AnsiString read FGtkName write FGtkName;
     { Naam van het objectrecord in gtk zoals gebruikt in typedeclaraties}
     property Props : TPropertyCollection read FProps write SetProps;
     { De verschillende properties, procedures, ... van en voor het object }
@@ -190,7 +190,7 @@ type
     { duid aan of er ook een pointerdefinitie moet zijn }
     property CreateObject : boolean read FCreateObject write FCreateObject default false;
     { duid aan of er een CreateGtkObject procedure moet aangemaakt worden }
-    property CreateParams : string read FCreateParams write FCreateParams;
+    property CreateParams : AnsiString read FCreateParams write FCreateParams;
     { Geeft de parameters die meegeven moeten worden aan de _New functie }
   end;
 
@@ -212,7 +212,7 @@ type
     FDefinition: TObjectCollection;
     FGtkPrefix,
     FUsesList,
-    FUnitName: string;
+    FUnitName: AnsiString;
     {$IFNDEF Delphi}
     FTop, FLeft : integer;
     {$ENDIF}
@@ -230,9 +230,9 @@ type
   published
     { Published declarations }
     property Definition : TObjectCollection read FDefinition write SetDefinition;
-    property GtkPrefix : string read FGtkPrefix write FGtkPrefix;
-    property UnitName : string read FUnitName write FUnitName;
-    property UsesList : string read FUsesList write FUsesList;
+    property GtkPrefix : AnsiString read FGtkPrefix write FGtkPrefix;
+    property UnitName : AnsiString read FUnitName write FUnitName;
+    property UsesList : AnsiString read FUsesList write FUsesList;
     {$IFNDEF delphi}
     // Compatibiliteit met Delphi
     property Left : integer read FLeft write FLeft;
@@ -241,8 +241,8 @@ type
   end;
 
 var
-  GtkPrefix : string = 'gtk';
-  ObjectsPrefix : string = 'FPgtk';
+  GtkPrefix : AnsiString = 'gtk';
+  ObjectsPrefix : AnsiString = 'FPgtk';
 
 procedure Register;
 
@@ -257,7 +257,7 @@ const
   PropUsesGtkName = [pftProc, pftExistingProc];
 
 var
-  lowerObjectsPrefix : string;
+  lowerObjectsPrefix : AnsiString;
   ObjectsPrefixLength : integer;
 
 procedure Register;
@@ -317,12 +317,12 @@ begin
   inherited;
 end;
 
-function TParameterItem.GetDisplayName: string;
+function TParameterItem.GetDisplayName: AnsiString;
 begin
   result := FName;
 end;
 
-procedure TParameterItem.SetDisplayName(const Value: string);
+procedure TParameterItem.SetDisplayName(const Value: AnsiString);
 begin
   FName := Value;
 end;
@@ -377,12 +377,12 @@ begin
 end;
 
 const
-  DispPropType : array [TPropType] of string =
+  DispPropType : array [TPropType] of AnsiString =
     ('Field','Property','Function','Procedure', 'Signal',
      'HelperProc','HelperFunc','SignalType','Declarations', 'TypeDeclaration',
      'Constructor','Destructor','Initialization','Finilization');
 
-function TPropertyItem.GetDisplayName: string;
+function TPropertyItem.GetDisplayName: AnsiString;
 begin
   if FPropType = ptDeclarations then
     if Section = ispublished then
@@ -406,7 +406,7 @@ begin
   FCode.assign (Value);
 end;
 
-procedure TPropertyItem.SetDisplayName(const Value: string);
+procedure TPropertyItem.SetDisplayName(const Value: AnsiString);
 begin
   FName := Value;
 end;
@@ -481,17 +481,17 @@ begin
   inherited;
 end;
 
-function TObjectItem.GetDisplayName: string;
+function TObjectItem.GetDisplayName: AnsiString;
 begin
   result := FName;
 end;
 
-procedure TObjectItem.SetDisplayName(const Value: string);
+procedure TObjectItem.SetDisplayName(const Value: AnsiString);
 begin
   FName := Value;
 end;
 
-procedure TObjectItem.SetGtkFuncName(const Value: string);
+procedure TObjectItem.SetGtkFuncName(const Value: AnsiString);
 begin
   FGtkFuncName := Value;
   {$IFDEF writecreate}
@@ -550,9 +550,9 @@ begin
 end;
 
 const
-  DispPropFuncType : array [TPropFuncType] of string = ('GtkFunc','ObjField',
+  DispPropFuncType : array [TPropFuncType] of AnsiString = ('GtkFunc','ObjField',
       'ObjFunc','Field','Proc','NotImplemented','GtkMacro','ExistingProc');
-  DispProcType : array [TProcType] of string = ('Override', 'Virtual', 'Dynamic',
+  DispProcType : array [TProcType] of AnsiString = ('Override', 'Virtual', 'Dynamic',
       'Abstract', 'Cdecl', 'Overload', 'Reintroduce');
 
 procedure TObjectDefs.Save (List : TStrings);
@@ -673,7 +673,7 @@ resourcestring
 procedure TObjectDefs.Load (List : TStrings);
 
 var line : integer;
-    item, value : string;
+    item, value : AnsiString;
     HasLine : boolean;
 
   procedure SplitNext;
@@ -742,7 +742,7 @@ var line : integer;
       Rproptype : TPropType;
       RpropFuncType : TpropFuncType;
       counter : integer;
-      s : string;
+      s : AnsiString;
   begin
     with AProperty do
       begin
@@ -1019,7 +1019,7 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
       TheUnit.add ('  T'+ObjectsPrefix+Name+' = class;');
   end;
 
-  function CalcProcTypes (ProcTypes : TProcTypeSet; InImplementation:boolean) : string; overload;
+  function CalcProcTypes (ProcTypes : TProcTypeSet; InImplementation:boolean) : AnsiString; overload;
   begin
     if not InImplementation then
       begin
@@ -1045,7 +1045,7 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
       result := result + ' Overload;';
   end;
 
-  function CalcProcTypes (ProcTypes : TProcTypeSet) : string; overload;
+  function CalcProcTypes (ProcTypes : TProcTypeSet) : AnsiString; overload;
   begin
     result := CalcProcTypes (ProcTypes, False);
   end;
@@ -1053,12 +1053,12 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
   type
     TConvType = (ToGtk, ToLuk, ToFPgtk);
 
-  function ConvertType (PascalType : string; ConvType : TConvType) : string;
+  function ConvertType (PascalType : AnsiString; ConvType : TConvType) : AnsiString;
   begin
     PascalType := lowercase (PascalType);
     if ConvType = ToGtk then
       begin
-      if PascalType = 'string' then
+      if PascalType = 'AnsiString' then
         result := 'pgChar'
       else if copy(PascalType,1,ObjectsPrefixLength+1) = 't'+LowerObjectsPrefix then
         result := 'PGtk' + copy (PascalType, ObjectsPrefixLength+2, maxint)
@@ -1070,7 +1070,7 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
     else
       begin
       if PascalType = 'pgChar' then
-        result := 'string'
+        result := 'AnsiString'
       else if copy(PascalType,1,4) = 'pgtk' then
         result := 'T'+ObjectsPrefix + copy (PascalType, 5, maxint)
       else if PascalType = 'gint' then
@@ -1080,12 +1080,12 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
       end;
   end;
 
-  function DoConvert (Variable, PascalType : string; ConvType : TConvType) : string;
-  var s : string;
+  function DoConvert (Variable, PascalType : AnsiString; ConvType : TConvType) : AnsiString;
+  var s : AnsiString;
   begin
     result := variable;
     PascalType := lowercase (PascalType);
-    if PascalType = 'string' then
+    if PascalType = 'AnsiString' then
       begin
       if ConvType <> ToLuk then
         result := 'ConvertToPgchar('+result+')'
@@ -1125,7 +1125,7 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
       end;
   end;
 
-  function CalcParam (param : TParameterItem; Declaration : boolean; ConvType : TConvType) : string;
+  function CalcParam (param : TParameterItem; Declaration : boolean; ConvType : TConvType) : AnsiString;
   begin
     with Param do
       begin
@@ -1149,9 +1149,9 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
   type
     TParamListType = (plDecl, plImpl, plImplCl, plImplLukCl);
 
-  function CalcParameterList (params : TParamCollection; PLType : TParamListType) : string; overload;
+  function CalcParameterList (params : TParamCollection; PLType : TParamListType) : AnsiString; overload;
   var r : integer;
-      Sep : string[2];
+      Sep : AnsiString[2];
       ct : TConvType;
   begin
     if PLType = plDecl then
@@ -1175,7 +1175,7 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
         end;
   end;
 
-  function CalcParameterList (params : TParamCollection) : string; overload;
+  function CalcParameterList (params : TParamCollection) : AnsiString; overload;
   var r : integer;
   begin
     with params do
@@ -1196,7 +1196,7 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
   procedure WriteObjectInterface (Obj : TObjectItem);
   var r : integer;
       TheList : TStrings;
-      I, N, s : string;
+      I, N, s : AnsiString;
   begin
     Lpublic.Clear;
     LProt.Clear;
@@ -1331,8 +1331,8 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
               end;
             ptSignalType :
               begin
-              TheList.Add ('    function ' + Name + 'Connect (Signal:string; Proc:T'+ObjectsPrefix+Name+'Function; data:pointer) : guint;');
-              TheList.Add ('    function ' + Name + 'ConnectAfter (Signal:string; Proc:T'+ObjectsPrefix+Name+'Function; data:pointer) : guint;');
+              TheList.Add ('    function ' + Name + 'Connect (Signal:AnsiString; Proc:T'+ObjectsPrefix+Name+'Function; data:pointer) : guint;');
+              TheList.Add ('    function ' + Name + 'ConnectAfter (Signal:AnsiString; Proc:T'+ObjectsPrefix+Name+'Function; data:pointer) : guint;');
               end;
             ptConstructor :
               TheList.Add ('    constructor ' + Name + CalcParameterList(Parameters, plDecl)
@@ -1376,7 +1376,7 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
   end;
 
   procedure WriteObjectImplementation (Obj : TObjectItem);
-  var gn, n, s, start, midden, eind, res : string;
+  var gn, n, s, start, midden, eind, res : AnsiString;
       r, l, p : integer;
   begin
     with Obj, TheUnit do
@@ -1545,7 +1545,7 @@ procedure TObjectDefs.Write(TheUnit : TStrings; StepIt : TLukStepItProc; StepItM
                    '  '+eind+'p ('+s+')'+CRLF+
                    '  end;'+CRLF+
                    'end;'+CRLF);
-              midden := ' (signal:string; proc:T'+ObjectsPrefix+Name+
+              midden := ' (signal:AnsiString; proc:T'+ObjectsPrefix+Name+
                                               'Function; data:pointer) : guint;'+CRLF+
                    'begin'+CRLF+
                    '  result := '+GtkPrefix+'_signal_connect';

packages/fpgtk/src/editor/buttonrow.pp

@@ -37,9 +37,9 @@ type
     FCalcIconFunc : TCalcIconFunc;
     FSelectIndex : integer;
     FNeedFocus : boolean;
-    FTitle : string;
+    FTitle : AnsiString;
     AccelGroup : PGtkAccelGroup;
-    procedure SetTitle (Value : string);
+    procedure SetTitle (Value : AnsiString);
     procedure CreatePixmaps;
     procedure NewSelection (Sender : TFPgtkObject; row,column:integer;
                             event:PGdkEventButton; data : pointer);
@@ -65,7 +65,7 @@ type
     procedure ChangeCollection (ACollection : TCollection);
     function CurrentItem : TCollectionItem;
     property SelectedRow : integer read FSelectIndex;
-    property Title : string read FTitle write SetTitle;
+    property Title : AnsiString read FTitle write SetTitle;
 
   end;
 
@@ -79,7 +79,7 @@ var
 
 { TButtonRow }
 
-procedure TButtonRow.SetTitle (Value : string);
+procedure TButtonRow.SetTitle (Value : AnsiString);
 begin
   FTitle := Value + ': ';
 end;

packages/fpgtk/src/editor/finddlgs.pp

@@ -21,19 +21,19 @@ uses gtk, FPgtk;
 type
   TFindDialog = class (TFPgtkWindow)
   private
-    FSearchString : string;
+    FSearchString : AnsiString;
     EditSearch : TFPgtkEntry;
-    procedure SetSearchString (Value:string);
+    procedure SetSearchString (Value:AnsiString);
     procedure ChangeText (Sender:TFPgtkObject; data:pointer);
   public
     constructor create (WindowType : TGtkWindowType); override;
     procedure DoDialogInit (InitData : pointer); override;
-    property SearchString : string read FSearchString write SetSearchString;
+    property SearchString : AnsiString read FSearchString write SetSearchString;
   end;
 
   PFindDialogData = ^TFindDialogData;
   TFindDialogData = record
-    Text : string;
+    Text : AnsiString;
   end;
 
 implementation
@@ -79,7 +79,7 @@ begin
   inherited;
 end;
 
-procedure TFindDialog.SetSearchString (Value : string);
+procedure TFindDialog.SetSearchString (Value : AnsiString);
 begin
   EditSearch.Text := Value;
 end;

packages/fpgtk/src/editor/gtkeditor.pp

@@ -125,16 +125,16 @@ type
     procedure ParamDisplayChanged;
     procedure ComposeWindow;
   { File and menu handling }
-    FFileName : string;
+    FFileName : AnsiString;
     HasAFile : boolean;
     FReopenList : TStrings;
     MenuEditObject, MenuEditProperty, MenuEditParameter,
     MenuFileReopen : TFPgtkMenuItem;
     AccelGroup : integer;
-    procedure NewFilename (NewName : string);
+    procedure NewFilename (NewName : AnsiString);
     procedure BuildReopenList;
-    procedure DataRead (filename : string);
-    procedure DataWrite (filename : string);
+    procedure DataRead (filename : AnsiString);
+    procedure DataWrite (filename : AnsiString);
     procedure Generate;
   { Menu signals }
     procedure FileNew (Sender : TFPgtkObject; data : pointer);
@@ -166,10 +166,10 @@ uses XPMs, GtkDefTexts, inifiles, ProgWin;
 Type
   TRightLabel = class (TFPgtkLabel)
   public
-    constructor create(aText : string);
+    constructor create(aText : AnsiString);
   end;
 
-constructor TRightLabel.Create (aText : string);
+constructor TRightLabel.Create (aText : AnsiString);
 begin
   inherited create (aText);
   XAlign := 1;
@@ -672,12 +672,12 @@ end;
 
 procedure TGtkEditorWindow.CreatePixmaps;
 
-  procedure GdkPixmap (Data : array of string; var pm : PGdkPixmap; var bm : PGdkBitmap);
+  procedure GdkPixmap (Data : array of AnsiString; var pm : PGdkPixmap; var bm : PGdkBitmap);
   var ppdata : ppgchar;
   begin
     ppdata := ArrayToPPgchar(Data);
     pm := gdk_pixmap_colormap_create_from_xpm_d (nil, Colormap, @bm, nil, ppdata);
-    freemem (ppdata, sizeof (pchar) * (high(data)-low(data)+1));
+    freemem (ppdata, sizeof (PAnsiChar) * (high(data)-low(data)+1));
   end;
 
 begin
@@ -721,7 +721,7 @@ end;
 
 procedure TGtkEditorWindow.RefreshProperty (Selected : TCollectionItem; NeedFocus:boolean);
 var r : byte;
-    s : string;
+    s : AnsiString;
 begin
   RefreshingProperty := True;
   try
@@ -994,7 +994,7 @@ begin
 end;
 
 procedure TGtkEditorWindow.ChangedPCode (Sender:TFPgtkObject; data:pointer);
-var s : string;
+var s : AnsiString;
 begin
   if RefreshingProperty then Exit;
   if assigned(ciProperty) then
@@ -1037,7 +1037,7 @@ begin
 end;
 
 procedure TGtkEditorWindow.ChangedPWCode (Sender:TFPgtkObject; data:pointer);
-var s : string;
+var s : AnsiString;
 begin
   if RefreshingProperty then Exit;
   if assigned(ciProperty) then
@@ -1129,7 +1129,7 @@ begin
     end;
 end;
 
-procedure TGtkEditorWindow.NewFilename (NewName : string);
+procedure TGtkEditorWindow.NewFilename (NewName : AnsiString);
 var r : integer;
 begin
   if NewName = '' then
@@ -1147,7 +1147,7 @@ begin
     end;
 end;
 
-procedure TGtkEditorWindow.DataWrite (filename : string);
+procedure TGtkEditorWindow.DataWrite (filename : AnsiString);
 var
   BinStream : TMemoryStream;
   StrStream : TFileStream;
@@ -1188,10 +1188,10 @@ begin
   end;
 end;
 
-procedure TGtkEditorWindow.DataRead (filename : string);
+procedure TGtkEditorWindow.DataRead (filename : AnsiString);
 var FStream : TFileStream;
     MStream : TMemoryStream;
-    s : string[6];
+    s : AnsiString[6];
     l : TStrings;
 begin
   if fileExists (filename) then
@@ -1404,7 +1404,7 @@ const
 
 procedure TGtkEditorWindow.ReadSettings;
 var c, r : integer;
-    s : string;
+    s : AnsiString;
 begin
   with FSettings do
   with TMemInifile.Create(ChangeFileExt(paramstr(0), '.ini')) do

packages/fpgtk/src/editor/settingsrec.pp

@@ -30,7 +30,7 @@ type
   TSettingsRec = record
     SaveOnClose : boolean;
     FileFormat : TFileFormat;
-    Extension : string;
+    Extension : AnsiString;
     MRUCount : integer;
     ShowProgress : boolean;
   end;
@@ -51,10 +51,10 @@ type
     Constructor Create;
   end;
 
-procedure Log (s : string); overload;
-procedure Log (fmt : string; params : array of const); overload;
-procedure Log (indent:integer; s:string);
-procedure Log (indent:integer; fmt:string; params:array of const);
+procedure Log (s : AnsiString); overload;
+procedure Log (fmt : AnsiString; params : array of const); overload;
+procedure Log (indent:integer; s:AnsiString);
+procedure Log (indent:integer; fmt:AnsiString; params:array of const);
 
 implementation
 
@@ -178,24 +178,24 @@ begin
   inherited;
 end;
 
-procedure Log (s : string);
+procedure Log (s : AnsiString);
 begin
   {$ifdef UseLog}
   writeln (s);
   {$endif}
 end;
 
-procedure Log (fmt : string; params : array of const);
+procedure Log (fmt : AnsiString; params : array of const);
 begin
   Log (format (fmt, params));
 end;
 
-procedure Log (indent:integer; fmt:string; params:array of const);
+procedure Log (indent:integer; fmt:AnsiString; params:array of const);
 begin
   Log (stringofchar(' ',indent) + format(fmt, params));
 end;
 
-procedure Log (indent:integer; s:string);
+procedure Log (indent:integer; s:AnsiString);
 begin
   Log (stringofchar(' ',indent) + s);
 end;

packages/fpgtk/src/editor/xpms.pp

@@ -19,7 +19,7 @@ interface
 
 const
 
-  XPMFileNew : array [0..16] of string = (
+  XPMFileNew : array [0..16] of AnsiString = (
       '11 13 3 1',
       '. c None',
       'x c #000000',  // black
@@ -38,7 +38,7 @@ const
       'xooooooooox',
       'xxxxxxxxxxx');
 
-  XPMFileOpen : array [0..17] of string = (
+  XPMFileOpen : array [0..17] of AnsiString = (
       '16 13 4 1',
       '. c None',     // no color
       '# c #000000',  // black
@@ -58,7 +58,7 @@ const
       '##ggggggggg#....',
       '###########.....');
 
-  XPMFileSave : array [0..17] of string = (
+  XPMFileSave : array [0..17] of AnsiString = (
       '14 14 4 1',
       '. c None',     // no color
       '# c #000000',  // black
@@ -78,7 +78,7 @@ const
       '#gg#######*#g#',
       '.#############');
 
-  XPMEditAdd : array [0..16] of string = (
+  XPMEditAdd : array [0..16] of AnsiString = (
           '15 13 3 1',
           '. c None',      // None
           'o c #000000',   // Black
@@ -97,7 +97,7 @@ const
           '...............',
           '...............');
 
-  XPMEditCopy : array [0..17] of string = (
+  XPMEditCopy : array [0..17] of AnsiString = (
           '15 13 4 1',
           '. c None',      // None
           '# c #000000',   // Black
@@ -117,7 +117,7 @@ const
           '......o-------o',
           '......ooooooooo');
 
-  XPMEditDelete : array [0..17] of string = (
+  XPMEditDelete : array [0..17] of AnsiString = (
           '14 13 4 1',
           '. c None',      // None
           '# c #000000',   // Black
@@ -137,7 +137,7 @@ const
           '..r-..........',
           '............r-');
 
-  XPMEditUp : array [0..15] of string = (
+  XPMEditUp : array [0..15] of AnsiString = (
           '7 13 2 1',
           '. c None',
           'x c #000000',
@@ -154,7 +154,7 @@ const
           '..xxx..',
           '..xxx..',
           '..xxx..');
-  XPMEditDown : array [0..15] of string = (
+  XPMEditDown : array [0..15] of AnsiString = (
           '7 13 2 1',
           '. c None',
           'x c #000000',
@@ -172,7 +172,7 @@ const
           '...x...',
           '...x...');
 
-  XPMGenerate : array [0..24] of string = (
+  XPMGenerate : array [0..24] of AnsiString = (
           '15 17 7 1',
           '. c None',      // None
           '# c #000000',   // Black
@@ -199,7 +199,7 @@ const
           'x-------------#',
           '.#############.');
 
-  XPMPropField : array [0..18] of string = (
+  XPMPropField : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -220,7 +220,7 @@ const
       '...............',
       '...............');
 
-  XPMPropProperty : array [0..18] of string = (
+  XPMPropProperty : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -241,7 +241,7 @@ const
       '.+++++++++++++.',
       '...............');
 
-  XPMPropFunction : array [0..18] of string = (
+  XPMPropFunction : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -262,7 +262,7 @@ const
       '...............',
       '...............');
 
-  XPMPropProcedure : array [0..18] of string = (
+  XPMPropProcedure : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -283,7 +283,7 @@ const
       '...............',
       '...............');
 
-  XPMPropHelperProc : array [0..18] of string = (
+  XPMPropHelperProc : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -304,7 +304,7 @@ const
       '...............',
       '...............');
 
-  XPMPropHelperFunc : array [0..18] of string = (
+  XPMPropHelperFunc : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -325,7 +325,7 @@ const
       '...............',
       '...............');
 
-  XPMPropSignalType : array [0..18] of string = (
+  XPMPropSignalType : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -346,7 +346,7 @@ const
       '+++.........+++',
       '...............');
 
-  XPMPropSignal : array [0..18] of string = (
+  XPMPropSignal : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -367,7 +367,7 @@ const
       '+++.........+++',
       '...............');
 
-  XPMPropdeclar : array [0..18] of string = (
+  XPMPropdeclar : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #FFFFFF',  // white
@@ -388,7 +388,7 @@ const
       '......+++**....',
       '.......+**.....');
 
-  XPMPropTypeDecl : array [0..18] of string = (
+  XPMPropTypeDecl : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #FFFFFF',  // white
@@ -409,7 +409,7 @@ const
       '......+++**....',
       '.......+**.....');
 
-  XPMPropConstr : array [0..18] of string = (
+  XPMPropConstr : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -430,7 +430,7 @@ const
       '...............',
       '...............');
 
-  XPMPropDestr : array [0..19] of string = (
+  XPMPropDestr : array [0..19] of AnsiString = (
       '15 15 4 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -452,7 +452,7 @@ const
       '-..............',
       '...............');
 
-  XPMPropInitial : array [0..18] of string = (
+  XPMPropInitial : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black
@@ -473,7 +473,7 @@ const
       '+*.............',
       '+*.............');
 
-  XPMPropFinal : array [0..18] of string = (
+  XPMPropFinal : array [0..18] of AnsiString = (
       '15 15 3 1',
       '. c None',     // no color
       '* c #000000',  // black

packages/fpgtk/src/fpgtkext.pp

@@ -52,14 +52,14 @@ type
     procedure OpenFileSelection (Sender : TFPgtkObject; data : pointer);
     procedure CloseFileSelection (Sender:TFPgtkWindow; DialogResult:pointer;
                                     Action:integer; initiator:TFPgtkObject);
-    procedure SetFilename (Value : string);
-    function GetFilename : string;
+    procedure SetFilename (Value : ansistring);
+    function GetFilename : ansistring;
   public
     constructor create;
     property Edit : TFPgtkEntry read FEdit;
     property Button : TFPgtkButton read FButton;
     property Image : TFPgtkPixmap read FImage;
-    property Filename : string read GetFilename write SetFilename;
+    property Filename : ansistring read GetFilename write SetFilename;
   end;
 
   TFPgtkCheckedButton = class (TFPgtkToggleButton)
@@ -68,8 +68,8 @@ type
     procedure ChangeCheck (Sender:TFPgtkObject; data:pointer);
   public
     constructor Create;
-    constructor CreateWithLabel (aText:string);
-    constructor CreateWithLabel (aText:string; AccelGroup : PGtkAccelGroup);
+    constructor CreateWithLabel (aText:ansistring);
+    constructor CreateWithLabel (aText:ansistring; AccelGroup : PGtkAccelGroup);
   end;
 
 { ==== Widget who needs a scrollwindow ==== }
@@ -79,20 +79,20 @@ type
   TFPgtkScrollText = class (TFPgtkScrolledWindow)
   private
     FText : TFPgtkText;
-    procedure SetTooltip (Value : string);
-    function GetTooltip : string;
+    procedure SetTooltip (Value : ansistring);
+    function GetTooltip : ansistring;
     function GetUdpatePolicy : TGtkUpdateType;
     procedure SetUpdatePolicy (Value : TGtkUpdateType);
-    function GetText : string;
-    procedure SetText (Value : string);
+    function GetText : ansistring;
+    procedure SetText (Value : ansistring);
     function GetLines : TStrings;
   public
     constructor create;
     procedure Clear;
     property TheText : TFPgtkText read FText;
-    property Tooltip : string read GetTooltip write SetTooltip;
+    property Tooltip : ansistring read GetTooltip write SetTooltip;
     property UpdatePolicy : TGtkUpdateType read GetUdpatePolicy write SetUpdatePolicy;
-    property Text : string read GetText write SetText;
+    property Text : ansistring read GetText write SetText;
     property Lines : TStrings read GetLines;
   end;
 
@@ -148,14 +148,14 @@ const
   mrNoToAll = mrNone + 9;
   mrYesToAll = mrNone + 10;
 
-function MessageDlg(const aMsg: string; DlgType: TMsgDlgType;
+function MessageDlg(const aMsg: ansistring; DlgType: TMsgDlgType;
                     Buttons: TMsgDlgButtons; HelpCtx: Longint): Integer;
 
 
-function MessageDlg(const Fmt: string; Args : Array of const; DlgType: TMsgDlgType;
+function MessageDlg(const Fmt: ansistring; Args : Array of const; DlgType: TMsgDlgType;
                     Buttons: TMsgDlgButtons; HelpCtx: Longint): Integer;
 
-procedure ShowMessage (const aTitle, aMessage : string);
+procedure ShowMessage (const aTitle, aMessage : ansistring);
 
 { ==== Menu handling ==== }
 
@@ -177,7 +177,7 @@ const
   gdk_Alt_mask = gdk_mod1_Mask;
   DefaultAccelFlags : TGtkAccelFlags = GTK_ACCEL_VISIBLE;
 
-function RemoveUnderscore (s : string) : string;
+function RemoveUnderscore (s : ansistring) : ansistring;
 function ConvertAccelModifier (amSet : TAccelModifiersSet) : TGdkModifierType;
 function ConvertModifierType (Mods : TGdkModifierType) : TAccelModifiersSet;
 function MakeAccelKeyDef (aWindow : TFPgtkWindow; anAG : integer; aKey : guint; aMods : TGdkModifierType) : PAccelKeyDef; overload;
@@ -186,35 +186,35 @@ function MakeAccelKeyDef (anAG : PGtkAccelGroup; aKey : guint; aMods : TGdkModif
 function MakeAccelKeyDef (anAG : PGtkAccelGroup; aKey : guint; aMods : TAccelModifiersSet) : PAccelKeyDef; overload;
 
 function NewMenuBar (items : array of TFPgtkMenuItem) : TFPgtkMenuBar;
-function NewMenu (ATitle : string; items : array of TFPgtkMenuItem) : TFPgtkMenu;
+function NewMenu (ATitle : ansistring; items : array of TFPgtkMenuItem) : TFPgtkMenu;
 
-function NewMenuItem (ACaption, AToolTip, AprivText : string; Accelerator : PAccelKeyDef;
+function NewMenuItem (ACaption, AToolTip, AprivText : ansistring; Accelerator : PAccelKeyDef;
                       ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem; overload;
-function NewMenuItem (ACaption, AToolTip, AprivText : string;
+function NewMenuItem (ACaption, AToolTip, AprivText : ansistring;
                       ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem; overload;
-function NewMenuItem (ACaption : string; Accelerator : PAccelKeyDef;
+function NewMenuItem (ACaption : ansistring; Accelerator : PAccelKeyDef;
                       ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem; overload;
-function NewMenuItem (ACaption : string; ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem; overload;
-function NewMenuItem (ACaption : string) : TFPgtkMenuItem; overload;
+function NewMenuItem (ACaption : ansistring; ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem; overload;
+function NewMenuItem (ACaption : ansistring) : TFPgtkMenuItem; overload;
 
 function NewLine : TFPgtkMenuItem;
 function NewTearOffMenu : TFPgtkTearOffMenuItem;
 
-function NewSubMenu (ACaption, ATooltip, AprivText : string; Accelerator : PAccelKeyDef;
+function NewSubMenu (ACaption, ATooltip, AprivText : ansistring; Accelerator : PAccelKeyDef;
                      Items : array of TFPgtkMenuItem) : TFPgtkMenuItem; Overload;
-function NewSubMenu (ACaption, ATooltip, AprivText : string;
+function NewSubMenu (ACaption, ATooltip, AprivText : ansistring;
                      Items : array of TFPgtkMenuItem) : TFPgtkMenuItem; Overload;
-function NewSubMenu (ACaption : string; Accelerator : PAccelKeyDef;
+function NewSubMenu (ACaption : ansistring; Accelerator : PAccelKeyDef;
                      Items : array of TFPgtkMenuItem) : TFPgtkMenuItem; Overload;
-function NewSubMenu (ACaption : string; Items : array of TFPgtkMenuItem) : TFPgtkMenuItem; Overload;
+function NewSubMenu (ACaption : ansistring; Items : array of TFPgtkMenuItem) : TFPgtkMenuItem; Overload;
 
-function NewCheckMenuItem (ACaption, AToolTip, AprivText : string; Accelerator : PAccelKeyDef;
+function NewCheckMenuItem (ACaption, AToolTip, AprivText : ansistring; Accelerator : PAccelKeyDef;
                       ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem; Overload;
-function NewCheckMenuItem (ACaption, AToolTip, AprivText : string;
+function NewCheckMenuItem (ACaption, AToolTip, AprivText : ansistring;
                       ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem; Overload;
-function NewCheckMenuItem (ACaption : string; Accelerator : PAccelKeyDef;
+function NewCheckMenuItem (ACaption : ansistring; Accelerator : PAccelKeyDef;
                       ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem; Overload;
-function NewCheckMenuItem (ACaption : string; ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem; Overload;
+function NewCheckMenuItem (ACaption : ansistring; ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem; Overload;
 
 procedure InsertMenuItemGroup (InMenu : TFPgtkMenuShell; position : integer; MenuItems : TFPgtkItemGroup); Overload;
 procedure InsertMenuItemGroup (InMenu : TFPgtkMenuShell; position : integer;
@@ -296,12 +296,12 @@ begin
   HPolicy := Gtk_Policy_Never;
 end;
 
-function TFPgtkScrollText.GetTooltip : string;
+function TFPgtkScrollText.GetTooltip : ansistring;
 begin
   result := inherited Tooltip;
 end;
 
-procedure TFPgtkScrollText.SetTooltip (Value : string);
+procedure TFPgtkScrollText.SetTooltip (Value : ansistring);
 begin
   TheText.Tooltip := Value;
   inherited Tooltip := Value;
@@ -326,7 +326,7 @@ begin
   {$endif}
 end;
 
-function TFPgtkScrollText.GetText : string;
+function TFPgtkScrollText.GetText : ansistring;
 begin
   if assigned(TheText) then
     begin
@@ -338,7 +338,7 @@ begin
     end;
 end;
 
-procedure TFPgtkScrollText.SetText (Value : string);
+procedure TFPgtkScrollText.SetText (Value : ansistring);
 begin
   if assigned (TheText) then
     TheText.Text := Value;
@@ -384,7 +384,7 @@ end;
 
 { Menu functions }
 
-function RemoveUnderscore (s : string) : string;
+function RemoveUnderscore (s : ansistring) : ansistring;
 begin
   result := stringreplace (s, '_', '', [rfReplaceAll]);
 end;
@@ -463,7 +463,7 @@ begin
       append (items[r]);
 end;
 
-function NewMenu (ATitle : string; items : array of TFPgtkMenuItem) : TFPgtkMenu;
+function NewMenu (ATitle : ansistring; items : array of TFPgtkMenuItem) : TFPgtkMenu;
 var r : integer;
     AG : PGtkAccelGroup;
     m : TFPgtkMenuItem;
@@ -484,7 +484,7 @@ begin
 end;
 
 function CreateMenuItem (Atype : TFPgtkMenuItemType; ACaption, ATooltip,
-                         APrivText : string; Accelerator : PAccelKeyDef) : TFPgtkMenuItem;
+                         APrivText : ansistring; Accelerator : PAccelKeyDef) : TFPgtkMenuItem;
 begin
   result := AType.CreateWithLabel (ACaption);
   if (ATooltip <> '') or (APrivText <> '') then
@@ -497,7 +497,7 @@ begin
     end;
 end;
 
-function NewMenuItem (ACaption, AToolTip, AprivText : string; Accelerator : PAccelKeyDef;
+function NewMenuItem (ACaption, AToolTip, AprivText : ansistring; Accelerator : PAccelKeyDef;
                       ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem;
 begin
   result := CreateMenuItem (TFPgtkMenuItem, ACaption, ATooltip, APrivtext, Accelerator);
@@ -505,24 +505,24 @@ begin
     result.ConnectActivate (ActivateFunc, AData);
 end;
 
-function NewMenuItem (ACaption, AToolTip, AprivText : string;
+function NewMenuItem (ACaption, AToolTip, AprivText : ansistring;
                       ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem;
 begin
   result := NewMenuItem (aCaption, aTooltip, aPrivText, nil, ActivateFunc, aData);
 end;
 
-function NewMenuItem (ACaption : string; Accelerator : PAccelKeyDef;
+function NewMenuItem (ACaption : ansistring; Accelerator : PAccelKeyDef;
                       ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem;
 begin
   result := NewMenuItem (aCaption, '', '', Accelerator, ActivateFunc, aData);
 end;
 
-function NewMenuItem (ACaption : string; ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem;
+function NewMenuItem (ACaption : ansistring; ActivateFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkMenuItem;
 begin
   result := NewMenuItem (aCaption, '', '', nil, ActivateFunc, aData);
 end;
 
-function NewMenuItem (ACaption : string) : TFPgtkMenuItem;
+function NewMenuItem (ACaption : ansistring) : TFPgtkMenuItem;
 begin
   result := NewMenuItem (aCaption, '', '', nil, nil, nil);
 end;
@@ -537,31 +537,31 @@ begin
   result := TFPgtkTearOffMenuItem.create;
 end;
 
-function NewSubMenu (ACaption, ATooltip, AprivText : string; Accelerator : PAccelKeyDef;
+function NewSubMenu (ACaption, ATooltip, AprivText : ansistring; Accelerator : PAccelKeyDef;
                      Items : array of TFPgtkMenuItem) : TFPgtkMenuItem;
 begin
   result := CreateMenuItem (TFPgtkMenuItem, ACaption, ATooltip, APrivText, Accelerator);
   result.SetSubmenu (NewMenu ('', Items));
 end;
 
-function NewSubMenu (ACaption, ATooltip, AprivText : string;
+function NewSubMenu (ACaption, ATooltip, AprivText : ansistring;
                      Items : array of TFPgtkMenuItem) : TFPgtkMenuItem;
 begin
   result := NewSubMenu (aCaption, aTooltip, aPrivText, nil, Items);
 end;
 
-function NewSubMenu (ACaption : string; Accelerator : PAccelKeyDef;
+function NewSubMenu (ACaption : ansistring; Accelerator : PAccelKeyDef;
                      Items : array of TFPgtkMenuItem) : TFPgtkMenuItem;
 begin
   result := NewSubMenu (aCaption, '', '', Accelerator, Items);
 end;
 
-function NewSubMenu (ACaption : string; Items : array of TFPgtkMenuItem) : TFPgtkMenuItem;
+function NewSubMenu (ACaption : ansistring; Items : array of TFPgtkMenuItem) : TFPgtkMenuItem;
 begin
   result := NewSubMenu (aCaption, '', '', nil, Items);
 end;
 
-function NewCheckMenuItem (ACaption, AToolTip, AprivText : string; Accelerator : PAccelKeyDef;
+function NewCheckMenuItem (ACaption, AToolTip, AprivText : ansistring; Accelerator : PAccelKeyDef;
                       ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem;
 begin
   result := TFPgtkCheckMenuItem(CreateMenuItem (TFPgtkCheckMenuItem, ACaption, ATooltip, APrivText, Accelerator));
@@ -569,19 +569,19 @@ begin
     Result.ConnectToggled (ToggledFunc, AData);
 end;
 
-function NewCheckMenuItem (ACaption, AToolTip, AprivText : string;
+function NewCheckMenuItem (ACaption, AToolTip, AprivText : ansistring;
                       ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem;
 begin
   result := NewCheckMenuItem (aCaption, aToolTip, aPrivText, nil, ToggledFunc, AData);
 end;
 
-function NewCheckMenuItem (ACaption : string; Accelerator : PAccelKeyDef;
+function NewCheckMenuItem (ACaption : ansistring; Accelerator : PAccelKeyDef;
                       ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem;
 begin
   result := NewCheckMenuItem (aCaption, '', '', Accelerator, ToggledFunc, AData);
 end;
 
-function NewCheckMenuItem (ACaption : string; ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem;
+function NewCheckMenuItem (ACaption : ansistring; ToggledFunc : TFPgtkSignalFunction; AData : pointer) : TFPgtkCheckMenuItem;
 begin
   result := NewCheckMenuItem (aCaption, '', '', nil, ToggledFunc, AData);
 end;
@@ -672,7 +672,7 @@ type
 
   PFileEntryData = ^TFileEntryData;
   TFileEntryData = record
-    aFilename : string;
+    aFilename : ansistring;
   end;
 
 constructor TFileEntryDialog.Create (AType:TGtkWindowType);
@@ -738,12 +738,12 @@ begin
   PackStart (FButton, false, true, 0);
 end;
 
-procedure TFPgtkFileEntry.SetFilename (Value : string);
+procedure TFPgtkFileEntry.SetFilename (Value : ansistring);
 begin
   FEdit.Text := Value;
 end;
 
-function TFPgtkFileEntry.GetFilename : string;
+function TFPgtkFileEntry.GetFilename : ansistring;
 begin
   result := FEdit.Text;
 end;
@@ -818,13 +818,13 @@ begin
   FUnchecked.visible := not b;
 end;
 
-constructor TFPgtkCheckedButton.CreateWithLabel (aText:string);
+constructor TFPgtkCheckedButton.CreateWithLabel (aText:ansistring);
 begin
   create;
   Text := aText;
 end;
 
-constructor TFPgtkCheckedButton.CreateWithLabel (aText:string; AccelGroup : PGtkAccelGroup);
+constructor TFPgtkCheckedButton.CreateWithLabel (aText:ansistring; AccelGroup : PGtkAccelGroup);
 begin
   create;
   Text := aText;
@@ -870,7 +870,7 @@ end;
 resourcestring
   rsOk = '   Ok   ';
 
-function MessageWindow (aTitle, aMessage : string) : TFPgtkWindow;
+function MessageWindow (aTitle, aMessage : ansistring) : TFPgtkWindow;
 var b : TFPgtkBox;
     but : TFPgtkButton;
     l : TFPgtkLabel;
@@ -905,7 +905,7 @@ begin
   result.Add (b);
 end;
 
-procedure ShowMessage (const aTitle, aMessage : string);
+procedure ShowMessage (const aTitle, aMessage : ansistring);
 begin
   with MessageWindow (aTitle, aMessage) do
     Execute (nil, nil, nil);
@@ -920,13 +920,13 @@ type
     FLTable : TFPgtkTable;
     FVBox : TFPgtkVBox;
     FButtonBox: TFPgtkButtonBox;
-    Constructor Create(AMsg:String; DlgType:TMsgDlgType; Buttons: TMsgDlgButtons);
+    Constructor Create(AMsg:ansistring; DlgType:TMsgDlgType; Buttons: TMsgDlgButtons);
     Procedure CreateButtons(Buttons: TMsgDlgButtons);
   end;
 
 const
 
-IMGInfo : Array[1..37] of string = ('32 32 4 1',
+IMGInfo : Array[1..37] of ansistring = ('32 32 4 1',
   '. c None',
   '  c None',
   'a c #ffffff', //#c3c3c3',
@@ -964,7 +964,7 @@ IMGInfo : Array[1..37] of string = ('32 32 4 1',
   '............#######.............',
   '................................');
 
-IMGWarning :Array[1..37] of string = ('32 32 4 1',
+IMGWarning :Array[1..37] of ansistring = ('32 32 4 1',
   '# c #000000',
   'b c #9c999c',
   '. c None',
@@ -1002,7 +1002,7 @@ IMGWarning :Array[1..37] of string = ('32 32 4 1',
   '....bbbbbbbbbbbbbbbbbbbbbbbbbbb.',
   '.....bbbbbbbbbbbbbbbbbbbbbbbbb..');
 
-IMGError : Array[1..37] of string = ('32 32 4 1',
+IMGError : Array[1..37] of ansistring = ('32 32 4 1',
   '. c None',
   'b c #808080',
   '# c #c00000',
@@ -1040,7 +1040,7 @@ IMGError : Array[1..37] of string = ('32 32 4 1',
   '................................',
   '................................');
 
-IMGConfirmation : Array[1..37] of string = ('32 32 4 1',
+IMGConfirmation : Array[1..37] of ansistring = ('32 32 4 1',
   '. c None',
   'b c #808080',
   'a c #c00000',
@@ -1079,7 +1079,7 @@ IMGConfirmation : Array[1..37] of string = ('32 32 4 1',
   '................................');
 
 
-Constructor TMessageDialogWindow.Create(AMsg : String;DlgType:TMsgDlgType;Buttons: TMsgDlgButtons);
+Constructor TMessageDialogWindow.Create(AMsg : ansistring;DlgType:TMsgDlgType;Buttons: TMsgDlgButtons);
 const
   OH = GTK_FILL OR GTK_EXPAND;
 begin
@@ -1115,7 +1115,7 @@ begin
 end;
 
 Const
-  ButtonText : Array[TMsgDlgBtn] of string  =
+  ButtonText : Array[TMsgDlgBtn] of ansistring  =
        ('Yes', 'No', 'OK', 'Cancel','Abort', 'Retry', 'Ignore',
         'All', 'NoToAll', 'YesToAll', 'Help');
   ButtonResult : array [TMsgDlgbtn] of TModalResult =
@@ -1137,14 +1137,14 @@ begin
       end;
 end;
 
-function MessageDlg(const aMsg: string; DlgType: TMsgDlgType;
+function MessageDlg(const aMsg: ansistring; DlgType: TMsgDlgType;
                     Buttons: TMsgDlgButtons; HelpCtx: Longint): Integer;
 begin
   With TMessageDialogWindow.Create(AMsg,DlgType,Buttons) do
     Result:=Execute(Nil,Nil,Nil);
 end;
 
-function MessageDlg(const Fmt: string; Args : Array of const; DlgType: TMsgDlgType;
+function MessageDlg(const Fmt: ansistring; Args : Array of const; DlgType: TMsgDlgType;
                     Buttons: TMsgDlgButtons; HelpCtx: Longint): Integer;
 begin
   Result:=MessageDlg(Format(Fmt,Args),Dlgtype,Buttons,HelpCtx);

packages/fpgtk/src/pgtk/pgtk.pp

@@ -5,7 +5,7 @@ Uses sysutils, ObjectDef, classes;
 type
   PGtkexception = class (Exception);
 
-procedure DataRead (Filename:string; var Descr:TObjectDefs);
+procedure DataRead (Filename:AnsiString; var Descr:TObjectDefs);
 var StrStream : TFileStream;
     BinStream : TMemoryStream;
 begin
@@ -30,7 +30,7 @@ begin
     raise PGtkException.Create ('Error: Can''t find file "'+filename+'"');
 end;
 
-procedure Convert (DescrFilename, UnitFilename : string);
+procedure Convert (DescrFilename, UnitFilename : AnsiString);
 var GTK : TObjectDefs;
     l : TStrings;
 begin