From cd78d9b191b18dc1463bab5a55766fff1b418fcf Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Tue, 25 Dec 2012 19:07:59 +0400 Subject: [PATCH] * xterm.h (struct x_output): Remove toolbar_detached member since it's set but never used. * gtkutil.c (xg_tool_bar_detach_callback, xg_tool_bar_attach_callback) (xg_create_tool_bar): Adjust users. --- src/ChangeLog | 4 ++++ src/gtkutil.c | 5 ++--- src/xterm.h | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 92ce2f795d..dfe3e3818e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,10 @@ * xdisp.c (redisplay_window): Remove inner local variable because the outer shadowed one has the same meaning. + * xterm.h (struct x_output): Remove toolbar_detached member since it's + set but never used. + * gtkutil.c (xg_tool_bar_detach_callback, xg_tool_bar_attach_callback) + (xg_create_tool_bar): Adjust users. 2012-12-24 Dmitry Antipov diff --git a/src/gtkutil.c b/src/gtkutil.c index 9f2b652525..7f50b67d1e 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -4138,7 +4138,7 @@ xg_tool_bar_detach_callback (GtkHandleBox *wbox, if (f) { GtkRequisition req, req2; - FRAME_X_OUTPUT (f)->toolbar_detached = 1; + gtk_widget_get_preferred_size (GTK_WIDGET (wbox), NULL, &req); gtk_widget_get_preferred_size (w, NULL, &req2); req.width -= req2.width; @@ -4173,7 +4173,7 @@ xg_tool_bar_attach_callback (GtkHandleBox *wbox, if (f) { GtkRequisition req, req2; - FRAME_X_OUTPUT (f)->toolbar_detached = 0; + gtk_widget_get_preferred_size (GTK_WIDGET (wbox), NULL, &req); gtk_widget_get_preferred_size (w, NULL, &req2); req.width += req2.width; @@ -4347,7 +4347,6 @@ xg_create_tool_bar (FRAME_PTR f) } x->toolbar_widget = gtk_toolbar_new (); - x->toolbar_detached = 0; gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar"); diff --git a/src/xterm.h b/src/xterm.h index d63ed1c458..e680cbe7dd 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -475,8 +475,6 @@ struct x_output GtkWidget *toolbar_widget; /* The handle box that makes the tool bar detachable. */ GtkWidget *handlebox_widget; - /* Non-zero if the tool bar is detached. */ - int toolbar_detached; /* Non-zero if tool bar is packed into the hbox widget (i.e. vertical). */ int toolbar_in_hbox; -- 2.20.1