Commit cd78d9b1 authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

* 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.
parent 45dd6480
......@@ -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 <dmantipov@yandex.ru>
 
......
......@@ -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");
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment