diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2016-02-10 20:16:25 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2016-02-10 20:16:25 (GMT) |
commit | 61b7967d5031e0724ac8d02694ff58505818a5a0 (patch) | |
tree | 4b9ea233e61ee9e688fd29e93a8061732a755e6e /src/gtkext | |
parent | abc912f8500312c888832ff521d3dd17d8b2c613 (diff) |
Refreshed all menu accesses in a better way.
Diffstat (limited to 'src/gtkext')
-rw-r--r-- | src/gtkext/easygtk.c | 7 | ||||
-rw-r--r-- | src/gtkext/gtkbufferview-int.h | 1 | ||||
-rw-r--r-- | src/gtkext/gtkbufferview.c | 8 | ||||
-rw-r--r-- | src/gtkext/gtkviewpanel-int.h | 4 | ||||
-rw-r--r-- | src/gtkext/gtkviewpanel.c | 9 |
5 files changed, 12 insertions, 17 deletions
diff --git a/src/gtkext/easygtk.c b/src/gtkext/easygtk.c index 5d255a5..3ba6664 100644 --- a/src/gtkext/easygtk.c +++ b/src/gtkext/easygtk.c @@ -953,13 +953,6 @@ void add_accelerator_to_menu_item(GtkWidget *item, const char *accelerator, GtkA gtk_accelerator_parse(accelerator, &key, &mods); - gboolean force_accel_activation(GtkWidget *widget, guint signal_id, gpointer data) - { - return TRUE; - } - - g_signal_connect(item, "can-activate-accel", G_CALLBACK(force_accel_activation), NULL); - gtk_widget_add_accelerator(item, "activate", group, key, mods, GTK_ACCEL_VISIBLE); diff --git a/src/gtkext/gtkbufferview-int.h b/src/gtkext/gtkbufferview-int.h index 944ddc7..ea181f9 100644 --- a/src/gtkext/gtkbufferview-int.h +++ b/src/gtkext/gtkbufferview-int.h @@ -64,7 +64,6 @@ struct _GtkBufferViewClass /* Signaux */ - void (* caret_moved) (GtkBufferView *, const vmpa2t *); void (* reach_limit) (GtkBufferView *, GdkScrollDirection); }; diff --git a/src/gtkext/gtkbufferview.c b/src/gtkext/gtkbufferview.c index 0e3beeb..d54560c 100644 --- a/src/gtkext/gtkbufferview.c +++ b/src/gtkext/gtkbufferview.c @@ -150,14 +150,6 @@ static void gtk_buffer_view_class_init(GtkBufferViewClass *class) panel_class->move_caret_to = (move_caret_to_fc)_gtk_buffer_view_move_caret_to; panel_class->cache_glance = (cache_glance_fc)gtk_buffer_view_cache_glance; - g_signal_new("caret-moved", - GTK_TYPE_BUFFER_VIEW, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkBufferViewClass, caret_moved), - NULL, NULL, - g_cclosure_user_marshal_VOID__UINT64, - G_TYPE_NONE, 1, G_TYPE_UINT64); - g_signal_new("reach-limit", GTK_TYPE_BUFFER_VIEW, G_SIGNAL_RUN_LAST, diff --git a/src/gtkext/gtkviewpanel-int.h b/src/gtkext/gtkviewpanel-int.h index 5fbcd76..9a2f885 100644 --- a/src/gtkext/gtkviewpanel-int.h +++ b/src/gtkext/gtkviewpanel-int.h @@ -101,6 +101,10 @@ struct _GtkViewPanelClass move_caret_to_fc move_caret_to; /* Déplacement du curseur */ cache_glance_fc cache_glance; /* Cache de la mignature */ + /* Signaux */ + + void (* caret_moved) (GtkViewPanel *, const vmpa2t *); + }; /* Propriétés propres au composant d'affichage */ diff --git a/src/gtkext/gtkviewpanel.c b/src/gtkext/gtkviewpanel.c index 861b46f..a347ad8 100644 --- a/src/gtkext/gtkviewpanel.c +++ b/src/gtkext/gtkviewpanel.c @@ -25,7 +25,6 @@ #include "gtkviewpanel-int.h" -#include "../glibext/chrysamarshal.h" @@ -127,6 +126,14 @@ static void gtk_view_panel_class_init(GtkViewPanelClass *class) panel_class->compute_inc = gtk_view_panel_compute_scroll_inc; + g_signal_new("caret-moved", + GTK_TYPE_VIEW_PANEL, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkViewPanelClass, caret_moved), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); + } |