paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-09 20:15:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed gtk3 binding error in g_application_register. The Gio-1.0.gir file does not have the third parameter so it's not a bug with gir2pascal.

Browse Source 
git-svn-id: trunk@43651 -
This commit is contained in:
andrew 2014-01-05 17:24:05 +00:00
parent f4f2a396d1
commit dbfb74e2ae
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lcl/interfaces/gtk3/gtk3bindings/lazgio2.pas
View File

@ -1048,7 +1048,7 @@ type
procedure hold; cdecl; inline; procedure hold; cdecl; inline;
procedure open(files: PPGFile; n_files: gint; hint: Pgchar); cdecl; inline; procedure open(files: PPGFile; n_files: gint; hint: Pgchar); cdecl; inline;
procedure quit; cdecl; inline; procedure quit; cdecl; inline;
function register(cancellable: PGCancellable): gboolean; cdecl; inline; function register(cancellable: PGCancellable; error: PPGError): gboolean; cdecl; inline;
procedure release; cdecl; inline; procedure release; cdecl; inline;
function run(argc: gint; argv: PPgchar): gint; cdecl; inline; function run(argc: gint; argv: PPgchar): gint; cdecl; inline;
procedure set_action_group(action_group: PGActionGroup); cdecl; inline; procedure set_action_group(action_group: PGActionGroup); cdecl; inline;
@ -5511,7 +5511,7 @@ function g_application_get_is_remote(AApplication: PGApplication): gboolean; cde
function g_application_get_type: TGType; cdecl; external; function g_application_get_type: TGType; cdecl; external;
function g_application_id_is_valid(application_id: Pgchar): gboolean; cdecl; external; function g_application_id_is_valid(application_id: Pgchar): gboolean; cdecl; external;
function g_application_new(application_id: Pgchar; flags: TGApplicationFlags): PGApplication; cdecl; external; function g_application_new(application_id: Pgchar; flags: TGApplicationFlags): PGApplication; cdecl; external;
function g_application_register(AApplication: PGApplication; cancellable: PGCancellable): gboolean; cdecl; external; function g_application_register(AApplication: PGApplication; cancellable: PGCancellable; error: PPGError): gboolean; cdecl; external;
function g_application_run(AApplication: PGApplication; argc: gint; argv: PPgchar): gint; cdecl; external; function g_application_run(AApplication: PGApplication; argc: gint; argv: PPgchar): gint; cdecl; external;
function g_async_initable_get_type: TGType; cdecl; external; function g_async_initable_get_type: TGType; cdecl; external;
function g_async_initable_init_finish(AAsyncInitable: PGAsyncInitable; res: PGAsyncResult): gboolean; cdecl; external; function g_async_initable_init_finish(AAsyncInitable: PGAsyncInitable; res: PGAsyncResult): gboolean; cdecl; external;
@ -7405,9 +7405,9 @@ begin
LazGio2.g_application_quit(@self); LazGio2.g_application_quit(@self);
end; end;
function TGApplication.register(cancellable: PGCancellable): gboolean; cdecl; function TGApplication.register(cancellable: PGCancellable; error: PPGError): gboolean; cdecl;
begin begin
Result := LazGio2.g_application_register(@self, cancellable); Result := LazGio2.g_application_register(@self, cancellable, error);
end; end;
procedure TGApplication.release; cdecl; procedure TGApplication.release; cdecl;

5
lcl/interfaces/gtk3/gtk3object.inc
View File

@ -98,7 +98,7 @@ begin
AId := 'lcl.' + dbgHex(PtrUInt(AGtkThread)); AId := 'lcl.' + dbgHex(PtrUInt(AGtkThread));
FGtk3Application := TGtkApplication.new(PgChar(AId), G_APPLICATION_NON_UNIQUE); FGtk3Application := TGtkApplication.new(PgChar(AId), G_APPLICATION_NON_UNIQUE);
// FGtk3Application^.set_application_id(PgChar(AId)); // FGtk3Application^.set_application_id(PgChar(AId));
FGtk3Application^.register(g_cancellable_new); FGtk3Application^.register(nil, nil);
GTK3WidgetSet := Self; GTK3WidgetSet := Self;
end; end;
@ -137,9 +137,10 @@ procedure TGtk3WidgetSet.SetDefaultAppFontName;
var var
AValue: TGValue; AValue: TGValue;
begin begin
AValue.g_type := G_TYPE_STRING; AValue.init(G_TYPE_STRING);
g_object_get_property(gtk_settings_get_default, 'gtk-font-name', @AValue); g_object_get_property(gtk_settings_get_default, 'gtk-font-name', @AValue);
FDefaultAppFontName := AValue.get_string; FDefaultAppFontName := AValue.get_string;
AValue.unset;
end; end;
procedure TGtk3WidgetSet.InitSysColorBrushes; procedure TGtk3WidgetSet.InitSysColorBrushes;