Browse Source

base: using string

mattias 9 months ago
parent
commit
0f1b89c1d8

+ 1 - 1
src/base/fcl.events.pas

@@ -30,7 +30,7 @@ uses
 
 Type
   TEventID = Word;
-  TEventName = UTF8String;
+  TEventName = String;
 
   EEvents = Class(Exception);
 

+ 1 - 1
src/base/fresnel.classes.pas

@@ -161,7 +161,7 @@ type
   TFresnelComponent = class(TComponent)
   Public
     Type
-      TFresnelLogHandler = Procedure (aType : TEventType; Const Msg : UTF8String) of object;
+      TFresnelLogHandler = Procedure (aType : TEventType; Const Msg : String) of object;
     Class var
       _LogHook : TFresnelLogHandler;
   Protected

+ 2 - 2
src/base/fresnel.forms.pas

@@ -251,7 +251,7 @@ type
     function GetMouseDownElement(out PageXY: TFresnelPoint): TFresnelElement;
     procedure SetMouseDownElement(El: TFresnelElement; const PageXY: TFresnelPoint);
   protected
-    procedure DoFresnelLog(aType: TEventType; const Msg: UTF8String); virtual;
+    procedure DoFresnelLog(aType: TEventType; const Msg: String); virtual;
     function GetHookFresnelLog: Boolean; virtual;
     procedure SetHookFresnelLog(AValue: Boolean); virtual;
     function CreateEventDispatcher(aDefaultSender : TObject) : TFresnelEventDispatcher; virtual;
@@ -860,7 +860,7 @@ begin
   fMouseDownPageXY:=PageXY;
 end;
 
-procedure TFresnelBaseApplication.DoFresnelLog(aType: TEventType; const Msg: UTF8String);
+procedure TFresnelBaseApplication.DoFresnelLog(aType: TEventType; const Msg: String);
 begin
   //writeln('TFresnelBaseApplication.DoFresnelLog ',aType,' ',Msg);
   Log(aType,Msg);

+ 2 - 2
src/base/fresnel.textlayouter.pas

@@ -22,8 +22,8 @@ Const
 
 Type
   {$IF SIZEOF(CHAR)=1}
-  TTextString = UTF8String;
-  TFontNameString = AnsiString;
+  TTextString = String;
+  TFontNameString = String;
   {$ELSE}
   TTextString = UnicodeString;
   TFontNameString = UnicodeString;