diff options
| author | Tim Janik <timj@gtk.org> | 2001-06-28 17:12:40 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-06-28 17:12:40 +0000 |
| commit | 10f047cf4ce86b7ff32050279214faac3c294f11 (patch) | |
| tree | 0ac0c649284a19fb3d6a4c32dd458ce42b4b6f62 /gtk/gtkmenubar.c | |
| parent | cd3ddf900fe4c392ba864bd6d12d914de211114a (diff) | |
| download | gtk+-10f047cf4ce86b7ff32050279214faac3c294f11.tar.gz | |
up version to 1.3.7, interface age 0, binary age 0. depend on glib 1.3.7.
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
Diffstat (limited to 'gtk/gtkmenubar.c')
| -rw-r--r-- | gtk/gtkmenubar.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 9965fef932..3b0cb73e10 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -437,18 +437,14 @@ add_to_window (GtkWindow *window, "gtk-menu-bar", menubar); - g_signal_connect_data (G_OBJECT (window), - "key_press_event", - G_CALLBACK (window_key_press_handler), - menubar, - NULL, FALSE, FALSE); + g_signal_connect (G_OBJECT (window), + "key_press_event", + G_CALLBACK (window_key_press_handler), + menubar); menubar->toplevel = GTK_WIDGET (window); } -/* Hack-around */ -#define g_signal_handlers_disconnect_by_func(obj, func, data) g_signal_handlers_disconnect_matched (obj, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, func, data) - static void remove_from_window (GtkWindow *window, GtkMenuBar *menubar) |