|
@@ -6,8 +6,6 @@ interface
|
|
|
|
|
|
uses
|
|
|
Math, Types, Classes, BaseUnix, Unix, sysutils, System.UITypes,
|
|
|
- // lazutils
|
|
|
- LazLoggerBase,
|
|
|
// gtk3
|
|
|
LazGtk3, LazGObject2, LazGLib2, LazGio2, Lazcairo1, LazGdk3,
|
|
|
{$IFDEF FresnelSkia}
|
|
@@ -472,11 +470,11 @@ begin
|
|
|
GDK_LEAVE_NOTIFY:
|
|
|
Result := GtkEventMouseLeave(Event);
|
|
|
GDK_FOCUS_CHANGE:
|
|
|
- debugln(['TSkiaGtk3WSForm.GtkEvent_Event GDK_FOCUS_CHANGE ',DbgSName(Self)]);
|
|
|
+ FLLog(etDebug,'TSkiaGtk3WSForm.GtkEvent_Event GDK_FOCUS_CHANGE %s',[Self.ToString]);
|
|
|
GDK_CONFIGURE:
|
|
|
; //Result := GtkEventResize(Event);
|
|
|
GDK_VISIBILITY_NOTIFY:
|
|
|
- debugln(['TSkiaGtk3WSForm.GtkEvent_Event GDK_VISIBILITY_NOTIFY ',DbgSName(Self)]);
|
|
|
+ FLLog(etDebug,'TSkiaGtk3WSForm.GtkEvent_Event GDK_VISIBILITY_NOTIFY %s',[Self.ToString]);
|
|
|
end;
|
|
|
end;
|
|
|
|
|
@@ -551,7 +549,7 @@ end;
|
|
|
|
|
|
procedure TGtk3WSForm.SetVisible(const AValue: boolean);
|
|
|
begin
|
|
|
- debugln(['TGtk3WSForm.SetVisible ',DbgSName(Form),' AValue=',AValue]);
|
|
|
+ FLLog(etDebug,'TGtk3WSForm.SetVisible %s AValue= %b',[Form.ToString,AValue]);
|
|
|
if FWindow=nil then
|
|
|
raise Exception.Create('TGtk3WSForm.SetVisible Window=nil');
|
|
|
if AValue then
|
|
@@ -595,7 +593,7 @@ const
|
|
|
var
|
|
|
ARect: TGdkRectangle;
|
|
|
begin
|
|
|
- debugln(['TGtk3WSForm.CreateGtkWindow Bounds=',dbgs(Form.FormBounds)]);
|
|
|
+ FLLog(etDebug,'TGtk3WSForm.CreateGtkWindow Bounds= %s',[Form.FormBounds.ToString]);
|
|
|
FWindow := TGtkWindow.new(GTK_WINDOW_TOPLEVEL);
|
|
|
Result:=Window;
|
|
|
|
|
@@ -660,7 +658,7 @@ begin
|
|
|
if not IsLibrary then
|
|
|
begin
|
|
|
AGtkThread := g_thread_self();
|
|
|
- AId := 'org.fresnelskiagtk3.thread_' + dbghex({%H-}PtrUInt(AGtkThread));
|
|
|
+ AId := 'org.fresnelskiagtk3.thread_' + hexstr({%H-}AGtkThread);
|
|
|
FGtk3Application := TGtkApplication.new(PgChar(AId), [G_APPLICATION_NON_UNIQUE]);
|
|
|
FGtk3Application^.register(nil, nil);
|
|
|
end;
|
|
@@ -705,13 +703,13 @@ begin
|
|
|
if Assigned(AList) then
|
|
|
begin
|
|
|
{$IFDEF VerboseGTK3}
|
|
|
- DebugLn('TSkiaGtk3App.AppTerminate Windows list ',dbgs(g_list_length(AList)));
|
|
|
+ FLLog(etDebug,'TSkiaGtk3App.AppTerminate Windows list %d',[g_list_length(AList)]);
|
|
|
{$ENDIF}
|
|
|
g_list_free(AList);
|
|
|
end else
|
|
|
begin
|
|
|
{$IFDEF VerboseGTK3}
|
|
|
- DebugLn('TSkiaGtk3App.AppTerminate Windows list is null ');
|
|
|
+ FLLog(etDebug,'TSkiaGtk3App.AppTerminate Windows list is null ');
|
|
|
{$ENDIF}
|
|
|
end;
|
|
|
FGtk3Application^.release;
|
|
@@ -733,7 +731,7 @@ var
|
|
|
aWSForm: TGtk3WSForm;
|
|
|
begin
|
|
|
if not (aFresnelForm is TFresnelCustomForm) then
|
|
|
- raise Exception.Create('TGtk3WidgetSet.CreateWSForm '+DbgSName(aFresnelForm));
|
|
|
+ raise Exception.Create('TGtk3WidgetSet.CreateWSForm '+aFresnelForm.ToString);
|
|
|
aForm:=TFresnelCustomForm(aFresnelForm);
|
|
|
aForm.FontEngine:=FontEngineGtk3;
|
|
|
|