Mercurial > emacs
comparison src/gtkutil.c @ 89969:3219f94257bc
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-34
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-514
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-522
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 04 Sep 2004 09:14:28 +0000 |
| parents | 59dcbfe97385 3f2598db97ac |
| children | f3ec05478165 |
comparison
equal
deleted
inserted
replaced
| 89968:1e9fa4848335 | 89969:3219f94257bc |
|---|---|
| 791 the frame is already mapped, so there is a "jumping" resize. | 791 the frame is already mapped, so there is a "jumping" resize. |
| 792 This makes geometry handling difficult, for example -0-0 will end | 792 This makes geometry handling difficult, for example -0-0 will end |
| 793 up in the wrong place as tool bar height has not been taken into account. | 793 up in the wrong place as tool bar height has not been taken into account. |
| 794 So we cheat a bit by setting a height that is what it will have | 794 So we cheat a bit by setting a height that is what it will have |
| 795 later on when tool bar items are added. */ | 795 later on when tool bar items are added. */ |
| 796 if (FRAME_EXTERNAL_TOOL_BAR (f) && FRAME_TOOLBAR_HEIGHT (f) == 0) | 796 if (FRAME_EXTERNAL_TOOL_BAR (f) && f->n_tool_bar_items == 0) |
| 797 FRAME_TOOLBAR_HEIGHT (f) = 34; | 797 FRAME_TOOLBAR_HEIGHT (f) = 34; |
| 798 | 798 |
| 799 | 799 |
| 800 /* We don't want this widget double buffered, because we draw on it | 800 /* We don't want this widget double buffered, because we draw on it |
| 801 with regular X drawing primitives, so from a GTK/GDK point of | 801 with regular X drawing primitives, so from a GTK/GDK point of |