[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100198: Fix bug #6139, text is brief
From: |
Jan D |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100198: Fix bug #6139, text is briefly shown in tool bar on startup. |
Date: |
Sat, 08 May 2010 14:04:47 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100198
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-08 14:04:47 +0200
message:
Fix bug #6139, text is briefly shown in tool bar on startup.
* xsettings.c (Ftool_bar_get_system_style): Correct comment.
* gtkutil.c (xg_pack_tool_bar): Change show_all to show for handle
box and toolbar (Bug #6139).
(xg_create_tool_bar): Remove comment (Bug #6139).
(xg_make_tool_item): Remove gtk_widget_show_all (Bug #6139).
(xg_show_toolbar_item): Add gtk_widget_show for weventbox (Bug #6139).
modified:
src/ChangeLog
src/gtkutil.c
src/xsettings.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-05-08 11:42:01 +0000
+++ b/src/ChangeLog 2010-05-08 12:04:47 +0000
@@ -1,3 +1,13 @@
+2010-05-08 Jan Djärv <address@hidden>
+
+ * xsettings.c (Ftool_bar_get_system_style): Correct comment.
+
+ * gtkutil.c (xg_pack_tool_bar): Change show_all to show for handle
+ box and toolbar (Bug #6139).
+ (xg_create_tool_bar): Remove comment (Bug #6139).
+ (xg_make_tool_item): Remove gtk_widget_show_all (Bug #6139).
+ (xg_show_toolbar_item): Add gtk_widget_show for weventbox (Bug #6139).
+
2010-05-08 Juanma Barranquero <address@hidden>
* makefile.w32-in ($(BLD)/eval.$(O), $(BLD)/w32fns.$(O)):
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2010-04-23 15:50:48 +0000
+++ b/src/gtkutil.c 2010-05-08 12:04:47 +0000
@@ -3778,7 +3778,9 @@
gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget,
vbox_pos);
- gtk_widget_show_all (x->handlebox_widget);
+
+ gtk_widget_show (x->toolbar_widget);
+ gtk_widget_show (x->handlebox_widget);
}
/* Create a tool bar for frame F. */
@@ -3794,13 +3796,6 @@
gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar");
- /* We only have icons, so override any user setting. We could
- use the caption property of the toolbar item (see update_frame_tool_bar
- below), but some of those strings are long, making the toolbar so
- long it does not fit on the screen. The GtkToolbar widget makes every
- item equal size, so the longest caption determine the size of every
- tool bar item. I think the creators of the GtkToolbar widget
- counted on 4 or 5 character long strings. */
gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS);
gtk_toolbar_set_orientation (GTK_TOOLBAR (x->toolbar_widget),
GTK_ORIENTATION_HORIZONTAL);
@@ -3877,8 +3872,6 @@
G_CALLBACK (xg_tool_bar_callback),
(gpointer) (EMACS_INT) i);
- gtk_widget_show_all (GTK_WIDGET (ti));
-
g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f);
/* Catch expose events to overcome an annoying redraw bug, see
@@ -3963,6 +3956,7 @@
else gtk_widget_hide (wlbl);
if (show_image) gtk_widget_show (wimage);
else gtk_widget_hide (wimage);
+ gtk_widget_show (GTK_WIDGET (weventbox));
gtk_widget_show (GTK_WIDGET (vb));
gtk_widget_show (GTK_WIDGET (wbutton));
gtk_widget_show (GTK_WIDGET (ti));
=== modified file 'src/xsettings.c'
--- a/src/xsettings.c 2010-04-30 13:50:34 +0000
+++ b/src/xsettings.c 2010-05-08 12:04:47 +0000
@@ -740,7 +740,7 @@
DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style,
Stool_bar_get_system_style,
0, 0, 0,
doc: /* Get the system tool bar style.
-If no system tool bar style is known, return `tool-bar-style' is set to a
+If no system tool bar style is known, return `tool-bar-style' if set to a
known style. Otherwise return image. */)
()
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100198: Fix bug #6139, text is briefly shown in tool bar on startup.,
Jan D <=