diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-12-25 19:07:59 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-12-25 19:07:59 +0400 |
| commit | cd78d9b191b18dc1463bab5a55766fff1b418fcf (patch) | |
| tree | a589dd0a776733a09785a554847f0735eb8a6197 /src/gtkutil.c | |
| parent | 45dd64808b72411218cf5fb7e80b0d879141f8c8 (diff) | |
* 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.
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 5 |
1 files changed, 2 insertions, 3 deletions
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"); |