diff options
Diffstat (limited to 'UCoreClasses.pas')
| -rw-r--r-- | UCoreClasses.pas | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/UCoreClasses.pas b/UCoreClasses.pas index 0c2a605..f4b8579 100644 --- a/UCoreClasses.pas +++ b/UCoreClasses.pas @@ -21,8 +21,7 @@ unit UCoreClasses; interface -uses gdk2pixbuf, gtk2, gdk2, glib2, SysUtils, Classes, ULibc, IniFiles, GTKClasses, GTKStdCtrls, GTKDialogs, GTKPixbuf, UGnome, - UEngines; +uses gtk2, lazglib2, lazgobject2, SysUtils, Classes, ULibc, IniFiles, GTKStdCtrls, GTKPixbuf; type TSystemUser = class public @@ -52,7 +51,7 @@ type TSystemUser = class private FReadOnly: boolean; public - constructor Create(const FileName: string; const ReadOnly: boolean); + constructor Create(const AFileName: string; ReadOnly: boolean); override; procedure UpdateFile; override; end; @@ -96,7 +95,7 @@ type TSystemUser = class implementation -uses GTKForms, GTKUtils, ULocale, UConfig, UCore, UCoreUtils; +uses GTKForms, ULocale, UCoreUtils; @@ -204,10 +203,10 @@ end; (********************************************************************************************************************************) (********************************************************************************************************************************) -constructor TMyIniFile.Create(const FileName: string; const ReadOnly: boolean); +constructor TMyIniFile.Create(const AFileName: string; ReadOnly: boolean); begin FReadOnly := ReadOnly; - inherited Create(FileName); + inherited Create(AFileName); end; procedure TMyIniFile.UpdateFile; @@ -231,7 +230,7 @@ begin gtk_box_pack_start(PGtkBox(FHBox), FLabel, True, True, 0); gtk_box_pack_start(PGtkBox(FHBox), FEventBoxRight, False, False, 0); gtk_container_add(PGtkContainer(FWidget), FHBox); - g_signal_connect(PGtkObject(FWidget), 'clicked', G_CALLBACK(@TGTKButton_OnClick), Self); + g_signal_connect_data(PGObject(FWidget), 'clicked', TGCallback(@TGTKButton_OnClick), Self, nil, G_CONNECT_DEFAULT); gtk_widget_show(FLabel); gtk_widget_show(FImage); gtk_widget_show(FHBox); @@ -253,7 +252,7 @@ begin gtk_box_pack_start(PGtkBox(FHBox), FImage, False, False, 0); gtk_box_pack_start(PGtkBox(FHBox), FEventBoxRight, False, False, 0); gtk_container_add(PGtkContainer(FWidget), FHBox); - g_signal_connect(PGtkObject(FWidget), 'clicked', G_CALLBACK(@TGTKButton_OnClick), Self); + g_signal_connect_data(PGObject(FWidget), 'clicked', TGCallback(@TGTKButton_OnClick), Self, nil, G_CONNECT_DEFAULT); gtk_widget_show(FLabel); gtk_widget_show(FImage); gtk_widget_show(FHBox); @@ -302,7 +301,7 @@ begin gtk_box_pack_start(PGtkBox(FHBox), FImage, False, False, 0); gtk_box_pack_start(PGtkBox(FHBox), FLabel, True, True, 0); gtk_container_add(PGtkContainer(FWidget), FHBox); - g_signal_connect(PGtkObject(FWidget), 'clicked', G_CALLBACK(@TGTKButton_OnClick), Self); + g_signal_connect_data(PGObject(FWidget), 'clicked', TGCallback(@TGTKButton_OnClick), Self, nil, G_CONNECT_DEFAULT); gtk_widget_show(FLabel); gtk_widget_show(FImage); gtk_widget_show(FHBox); @@ -316,7 +315,7 @@ begin FLabel := gtk_label_new(''); FImage := gtk_image_new; gtk_container_add(PGtkContainer(FWidget), FImage); - g_signal_connect(PGtkObject(FWidget), 'clicked', G_CALLBACK(@TGTKButton_OnClick), Self); + g_signal_connect_data(PGObject(FWidget), 'clicked', TGCallback(@TGTKButton_OnClick), Self, nil, G_CONNECT_DEFAULT); gtk_widget_show(FLabel); gtk_widget_show(FImage); Show; |