diff options
Diffstat (limited to 'UViewer.pas')
| -rw-r--r-- | UViewer.pas | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/UViewer.pas b/UViewer.pas index 6e5fe85..e3eff81 100644 --- a/UViewer.pas +++ b/UViewer.pas @@ -24,8 +24,8 @@ unit UViewer; interface uses - glib2, gdk2, gtk2, pango, - SysUtils, Types, Classes, Variants, GTKControls, GTKForms, GTKUtils, GTKDialogs, GTKPixbuf, GTKClasses, GTKExtCtrls, GTKConsts, + lazglib2, lazgobject2, gdk2, gtk2, pango, + SysUtils, Classes, GTKControls, GTKForms, GTKExtCtrls, GTKConsts, GTKText; type @@ -67,7 +67,7 @@ var implementation -uses UCoreUtils, UCoreClasses, UConfig, DateUtils, ULibc, UGnome; +uses UCoreUtils, UConfig, DateUtils, ULibc, UGnome; @@ -83,13 +83,13 @@ begin Caption := 'TuxView'; BorderWidth := 5; AThread := nil; - if @gtk_window_set_icon_name <> nil then gtk_window_set_icon_name(PGtkWindow(FWidget), 'text-x-generic'); // accessories-text-editor + gtk_window_set_icon_name(PGtkWindow(FWidget), 'text-x-generic'); // accessories-text-editor ScrolledWindow := TGTKScrolledWindow.Create(Self); ScrolledWindow.HorizScrollBarPolicy := sbAutomatic; ScrolledWindow.VertScrollBarPolicy := sbAutomatic; ScrolledWindow.ShadowType := stShadowIn; - g_signal_connect(G_OBJECT(ScrolledWindow.FWidget), 'scroll-event', G_CALLBACK (@scroll_event_callback), Self); + g_signal_connect_data(PGObject(ScrolledWindow.FWidget), 'scroll-event', TGCallback (@scroll_event_callback), Self, nil, G_CONNECT_DEFAULT); AddControl(ScrolledWindow); // ClientArea.AddControl(ScrolledWindow); @@ -98,8 +98,8 @@ begin FDrawingArea.FWidget := gtk_drawing_area_new; gtk_widget_set_events(FDrawingArea.FWidget, GDK_EXPOSURE_MASK or GDK_BUTTON_PRESS_MASK or GDK_POINTER_MOTION_MASK or GDK_KEY_PRESS_MASK); gtk_widget_set_size_request(FDrawingArea.FWidget, 10000, 40000); - g_signal_connect(G_OBJECT(FDrawingArea.FWidget), 'expose_event', G_CALLBACK (@expose_event_callback), Self); -// g_signal_connect_after(G_OBJECT(FDrawingArea.FWidget), 'key_press_event', G_CALLBACK (@key_press_event_callback), NULL); + g_signal_connect(G_OBJECT(FDrawingArea.FWidget), 'expose_event', TGCallback (@expose_event_callback), Self); +// g_signal_connect_after(G_OBJECT(FDrawingArea.FWidget), 'key_press_event', TGCallback (@key_press_event_callback), NULL); gtk_widget_set(FDrawingArea.FWidget, 'can_focus', TRUE, 0); gtk_widget_set(FDrawingArea.FWidget, 'can_default', TRUE, 0); gtk_widget_show(FDrawingArea.FWidget); @@ -112,7 +112,7 @@ begin TextView := TGTKTextView.Create(Self); TextView.CursorVisible := False; TextView.ReadOnly := True; - TextView.OnKeyDown := TextViewKeyDown; + TextView.OnKeyDown := @TextViewKeyDown; ScrolledWindow.AddControl(TextView); TextView.SetFocus; @@ -120,9 +120,9 @@ begin // ****************** - OnKeyDown := FormKeyDown; - OnDestroy := FormDestroy; - OnClose := FormClose; + OnKeyDown := @FormKeyDown; + OnDestroy := @FormDestroy; + OnClose := @FormClose; end; procedure TFViewer.FormKeyDown(Sender: TObject; Key: Word; Shift: TShiftState; var Accept: boolean); @@ -143,7 +143,7 @@ procedure TFViewer.FormDestroy(Sender: TObject); begin try LineBuffer.Free; - g_object_unref(window_group); + g_object_unref(PGObject(window_group)); except end; end; |