Mercurial > emacs
comparison src/xsettings.c @ 108315:8bb62bdbd80a
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).
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 08 May 2010 14:04:47 +0200 |
| parents | c9cc3dd13301 |
| children | ad09f2bfce51 |
comparison
equal
deleted
inserted
replaced
| 108314:36801ca3bd82 | 108315:8bb62bdbd80a |
|---|---|
| 738 } | 738 } |
| 739 | 739 |
| 740 DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style, Stool_bar_get_system_style, | 740 DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style, Stool_bar_get_system_style, |
| 741 0, 0, 0, | 741 0, 0, 0, |
| 742 doc: /* Get the system tool bar style. | 742 doc: /* Get the system tool bar style. |
| 743 If no system tool bar style is known, return `tool-bar-style' is set to a | 743 If no system tool bar style is known, return `tool-bar-style' if set to a |
| 744 known style. Otherwise return image. */) | 744 known style. Otherwise return image. */) |
| 745 () | 745 () |
| 746 { | 746 { |
| 747 if (EQ (Vtool_bar_style, Qimage) | 747 if (EQ (Vtool_bar_style, Qimage) |
| 748 || EQ (Vtool_bar_style, Qtext) | 748 || EQ (Vtool_bar_style, Qtext) |