diff options
Diffstat (limited to 'UToolTips.pas')
| -rw-r--r-- | UToolTips.pas | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/UToolTips.pas b/UToolTips.pas index a9ed9fb..6926456 100644 --- a/UToolTips.pas +++ b/UToolTips.pas @@ -22,7 +22,7 @@ unit UToolTips; interface -uses glib2, gdk2, gtk2, pango; +uses lazglib2, lazgobject2, gdk2, gtk2, pango; procedure FileListTipsInstall(ATreeView: PGtkTreeView); procedure FileListTipsEnable; @@ -55,8 +55,8 @@ function tips_button_press_event(widget: PGtkWidget; event: PGdkEventButton; use procedure FileListTipsInstall(ATreeView: PGtkTreeView); begin - g_signal_connect_after(ATreeView, 'event-after', G_CALLBACK(@event_handler), nil); - g_signal_connect(ATreeView, 'leave-notify-event', G_CALLBACK(@on_leave_notify), nil); + g_signal_connect_data(PGObject(ATreeView), 'event-after', TGCallback(@event_handler), nil, nil, [G_CONNECT_AFTER]); + g_signal_connect_data(PGObject(ATreeView), 'leave-notify-event', TGCallback(@on_leave_notify), nil, nil, G_CONNECT_DEFAULT); end; procedure file_list_tips_show_tip(AListView: PGtkTreeView; row: PGtkTreePath; column: PGtkTreeViewColumn); @@ -67,7 +67,7 @@ var Timeout: integer; begin if not tips_enabled then Exit; FileListTipsHide; - g_object_get(G_OBJECT(FMain.FWidget), 'is-active', @is_active, nil); + g_object_get(PGObject(FMain.FWidget), 'is-active', [@is_active, nil]); if not is_active then Exit; if Assigned(data_row) and (data_row <> row) then gtk_tree_path_free(data_row); data_panel := AListView; @@ -79,7 +79,7 @@ begin if (sec < 1) and (ms < ConstFileListTipsDelayNeighbour * 1000) then Timeout := 1; // DebugMsg(['Time elapsed = ', Double(sec), ':', integer(ms div 1000)]); end; - timer_id := gtk_timeout_add(Timeout, show_tip_widget, nil); + timer_id := gtk_timeout_add(Timeout, @show_tip_widget, nil); end; @@ -179,9 +179,9 @@ begin gtk_widget_set_name(GTK_WIDGET(tip_window), 'gtk-tooltips'); gtk_container_set_border_width(GTK_CONTAINER(tip_window), 4); gtk_widget_set_events(GTK_WIDGET(tip_window), GDK_POINTER_MOTION_MASK or GDK_BUTTON_PRESS_MASK or GDK_KEY_PRESS_MASK or GDK_FOCUS_CHANGE_MASK or GDK_SCROLL_MASK); - g_signal_connect(tip_window, 'event', G_CALLBACK(@tip_event_handler), nil); - g_signal_connect(tip_window, 'expose_event', G_CALLBACK(@gtk_tooltips_paint_window), tip_window); - g_signal_connect(tip_window, 'button-press-event', G_CALLBACK(@tips_button_press_event), tip_window); + g_signal_connect_data(PGObject(tip_window), 'event', TGCallback(@tip_event_handler), nil, nil, G_CONNECT_DEFAULT); + g_signal_connect_data(PGObject(tip_window), 'expose_event', TGCallback(@gtk_tooltips_paint_window), tip_window, nil, G_CONNECT_DEFAULT); + g_signal_connect_data(PGObject(tip_window), 'button-press-event', TGCallback(@tips_button_press_event), tip_window, nil, G_CONNECT_DEFAULT); tip_label := GTK_LABEL(gtk_label_new(nil)); gtk_misc_set_alignment(GTK_MISC(tip_label), 0, 0.5); @@ -232,7 +232,7 @@ var Text: PChar; pango_layout_set_font_description(Layout, FontDesc); end; pango_layout_get_pixel_size(Layout, @w, @h); - g_object_unref(Layout); + g_object_unref(PGObject(Layout)); Result := ColumnWidth > w; end; |
