diff options
| author | Jan Djärv | 2012-12-30 20:08:15 +0100 |
|---|---|---|
| committer | Jan Djärv | 2012-12-30 20:08:15 +0100 |
| commit | 8b745d925b620fba21bd575e375ed101c17d8e29 (patch) | |
| tree | 61762bcac520c425f4469c8003fd17b8b37a6ee4 /src/ChangeLog | |
| parent | 5a1d858bbc5410916d764e7f9c62b4e405fab592 (diff) | |
| download | emacs-8b745d925b620fba21bd575e375ed101c17d8e29.tar.gz emacs-8b745d925b620fba21bd575e375ed101c17d8e29.zip | |
Check for deprecated gtk tearoff menu item in configure.
* configure.ac: Check for GtkHandlebox.
Check for GtkTearoffMenuItem.
* src/gtkutil.c (TOOLBAR_TOP_WIDGET): New macro.
(xg_pack_tool_bar): Use TOOLBAR_TOP_WIDGET, condition out use of
handlebox_widget. Set toolbar_in_hbox to false/true, set
toolbar_is_packed to true.
(xg_update_tool_bar_sizes): Use widget returned by TOOLBAR_TOP_WIDGET.
(update_frame_tool_bar): Check toolbar_is_packed for packing.
Show all on TOOLBAR_TOP_WIDGET.
(free_frame_tool_bar): Check toolbar_is_packed. Use widget returned
by TOOLBAR_TOP_WIDGET.
(xg_change_toolbar_position): Use widget returned by TOOLBAR_TOP_WIDGET.
Check toolbar_is_packed.
(xg_have_tear_offs, tearoff_remove, tearoff_activate): Condition on
HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
(xg_have_tear_offs): When ! HAVE_GTK_TEAROFF_MENU_ITEM_NEW, return
false.
(create_menus): Create tearoff only if HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
(xg_update_menubar): Update title only if
HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
(xg_update_submenu): Skip tearoff only if
HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
(xg_initialize): Initialize xg_detached_menus only if
HAVE_GTK_TEAROFF_MENU_ITEM_NEW.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0234af5f1ef..bb69917bfb2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -11,6 +11,17 @@ | |||
| 11 | by TOOLBAR_TOP_WIDGET. | 11 | by TOOLBAR_TOP_WIDGET. |
| 12 | (xg_change_toolbar_position): Use widget returned by TOOLBAR_TOP_WIDGET. | 12 | (xg_change_toolbar_position): Use widget returned by TOOLBAR_TOP_WIDGET. |
| 13 | Check toolbar_is_packed. | 13 | Check toolbar_is_packed. |
| 14 | (xg_have_tear_offs, tearoff_remove, tearoff_activate): Condition on | ||
| 15 | HAVE_GTK_TEAROFF_MENU_ITEM_NEW. | ||
| 16 | (xg_have_tear_offs): When ! HAVE_GTK_TEAROFF_MENU_ITEM_NEW, return | ||
| 17 | false. | ||
| 18 | (create_menus): Create tearoff only if HAVE_GTK_TEAROFF_MENU_ITEM_NEW. | ||
| 19 | (xg_update_menubar): Update title only if | ||
| 20 | HAVE_GTK_TEAROFF_MENU_ITEM_NEW. | ||
| 21 | (xg_update_submenu): Skip tearoff only if | ||
| 22 | HAVE_GTK_TEAROFF_MENU_ITEM_NEW. | ||
| 23 | (xg_initialize): Initialize xg_detached_menus only if | ||
| 24 | HAVE_GTK_TEAROFF_MENU_ITEM_NEW. | ||
| 14 | 25 | ||
| 15 | * xterm.h (struct x_output): Surround handlebox_widget with | 26 | * xterm.h (struct x_output): Surround handlebox_widget with |
| 16 | #ifdef HAVE_GTK_HANDLE_BOX_NEW. toolbar_is_packed is new, | 27 | #ifdef HAVE_GTK_HANDLE_BOX_NEW. toolbar_is_packed is new, |