diff options
| author | Tor Lillqvist <tml@iki.fi> | 2003-01-12 04:44:23 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2003-01-12 04:44:23 +0000 |
| commit | 4a3c812b7d65144e7b56c83efcad415dfe9ba3ac (patch) | |
| tree | 9bd305c50c8874c8336f56f5d3152c6134f7e6c5 /gtk | |
| parent | 4b05e4b4a89f713900b8c710520c2fdf7885f47c (diff) | |
| download | gtk+-4a3c812b7d65144e7b56c83efcad415dfe9ba3ac.tar.gz | |
Merge from stable:
2003-01-12 Tor Lillqvist <tml@iki.fi>
Merge from stable:
* gtk/gtkmain.c: Move inclusion of config.h and gtkintl.h earlier,
as gtkprivate.h redefines GTK_LOCALEDIR on Win32, for run-time
lookup.
* gdk/Makefile.am (libgdk_win32_2_0_la_DEPENDENCIES): Depend on
gdk.def.
* gdk/gdk.def
* gtk/gtk.def: Add some missing entries. Thanks to Kenichi SUTO.
* gtk-zip.sh.in (DEVZIP): Add bin/{gtk-query-immodules-2.0,
gtk-demo}.exe and share/gtk-2.0.
* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
Implement by setting or clearing the WS_EX_TOOLWINDOW extended
window style.
(gdk_window_set_type_hint): Add all cases to the switch (not all
do anything, though). Handle GDK_WINDOW_TYPE_HINT_TOOLBAR by
calling gdk_window_set_skip_taskbar_hint(). This means that GTK
won't know that the skip_taskbar hint is on for the window, is
this bad?
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkmain.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 10b5f276cb..d124e30770 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -48,6 +48,9 @@ #include <pango/pango-utils.h> /* For pango_split_file_list */ +#include "config.h" +#include "gtkintl.h" + #include "gtkaccelmap.h" #include "gtkbox.h" #include "gtkdnd.h" @@ -59,9 +62,7 @@ #include "gtkwidget.h" #include "gtkwindow.h" #include "gtkprivate.h" -#include "config.h" #include "gtkdebug.h" -#include "gtkintl.h" /* Private type definitions */ |