diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2014-10-19 19:27:53 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2014-10-19 19:27:53 +0200 |
| commit | b9bdab7aca16e9928a51a4849fd81fbd5f52882c (patch) | |
| tree | 42a6f8585023962bbfa9585229b37c41186ed9bd /src/gtkutil.c | |
| parent | 5e3344686af38ea1c4f0556c73f5e0f0279f2ae3 (diff) | |
| download | emacs-b9bdab7aca16e9928a51a4849fd81fbd5f52882c.tar.gz | |
* gtkutil.c (create_dialog): Don't use gtk_dialog_get_action_area on
Gt+ >= 3.12, or gtk_misc_set_alignment on Gtk+ >= 3.14.
(make_widget_for_menu_item): Don't use gtk_misc_set_alignment on
Gtk+ >= 3.14 (Bug#18674).
(update_frame_tool_bar): Don't use gtk_misc_set_padding on
Gtk+ >= 3.14 (Bug#18674).
* gtkutil.c (xg_update_menubar, xg_update_menu_item): Only call
g_object_notify for label if Gtk+ >= 2.16 (Bug#16522).
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 759219a377d..01360244c2e 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2816,8 +2816,9 @@ xg_update_menubar (GtkWidget *menubar, bridge that might be loaded) that the item's label has changed. */ gtk_label_set_text (wlabel, utf8_label); +#if GTK_CHECK_VERSION (2, 16, 0) g_object_notify (G_OBJECT (witem), "label"); - +#endif if (utf8_label) g_free (utf8_label); iter = g_list_next (iter); val = val->next; @@ -2996,8 +2997,10 @@ xg_update_menu_item (widget_value *val, } } +#if GTK_CHECK_VERSION (2, 16, 0) if (label_changed) /* See comment in xg_update_menubar. */ g_object_notify (G_OBJECT (w), "label"); +#endif } /* Update the toggle menu item W so it corresponds to VAL. */ |