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?

10 files changed, 172 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index ddb3f01930..ebe3153e2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+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?
+
 Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ddb3f01930..ebe3153e2a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,29 @@
+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?
+
 Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ddb3f01930..ebe3153e2a 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,29 @@
+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?
+
 Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ddb3f01930..ebe3153e2a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,29 @@
+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?
+
 Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ddb3f01930..ebe3153e2a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,29 @@
+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?
+
 Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
 
 	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index f33a518c54..a91b4c8ebc 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -179,6 +179,7 @@ libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la @GDK_DEP_LIBS@
 libgdk_win32_2_0_la_LIBADD = \
 	win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib) \
 	@GDK_DEP_LIBS@
+libgdk_win32_2_0_la_DEPENDENCIES = gdk.def
 
 lib_LTLIBRARIES = $(gdktargetlib)
 
diff --git a/gdk/gdk.def b/gdk/gdk.def
index 38d5e333e6..a1e2bfb3ba 100644
--- a/gdk/gdk.def
+++ b/gdk/gdk.def
@@ -63,8 +63,9 @@ EXPORTS
 	gdk_display_get_core_pointer
 	gdk_display_get_default
 	gdk_display_get_default_screen
-	gdk_display_get_name
+	gdk_display_get_event
 	gdk_display_get_n_screens
+	gdk_display_get_name
 	gdk_display_get_pointer
 	gdk_display_get_screen
 	gdk_display_get_type
@@ -72,12 +73,17 @@ EXPORTS
 	gdk_display_keyboard_ungrab
 	gdk_display_list_devices
 	gdk_display_manager_get
+	gdk_display_manager_get_default_display
 	gdk_display_manager_list_displays
+	gdk_display_manager_set_default_display
 	gdk_display_open
 	gdk_display_open_default_libgtk_only
+	gdk_display_peek_event
 	gdk_display_pointer_is_grabbed
 	gdk_display_pointer_ungrab
+	gdk_display_put_event
 	gdk_display_set_double_click_time
+	gdk_display_set_pointer_hooks
 	gdk_display_sync
 	gdk_drag_abort
 	gdk_drag_action_get_type
@@ -158,6 +164,7 @@ EXPORTS
 	gdk_event_send_client_message
 	gdk_event_send_client_message_for_display
 	gdk_event_send_clientmessage_toall
+	gdk_event_set_screen
 	gdk_event_type_get_type
 	gdk_events_pending
 	gdk_exit
@@ -352,6 +359,7 @@ EXPORTS
 	gdk_screen_get_root_window
 	gdk_screen_get_setting
 	gdk_screen_get_system_colormap
+	gdk_screen_get_toplevel_windows
 	gdk_screen_get_type
 	gdk_screen_get_width
 	gdk_screen_height
@@ -523,4 +531,3 @@ EXPORTS
 	gdk_window_withdraw
 	gdk_wm_decoration_get_type
 	gdk_wm_function_get_type
-
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index ba803baa56..8b438832be 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -2559,7 +2559,22 @@ void
 gdk_window_set_skip_taskbar_hint (GdkWindow *window,
 				  gboolean   skips_taskbar)
 {
+  LONG extended_style;
+
   g_return_if_fail (GDK_IS_WINDOW (window));
+
+  GDK_NOTE (MISC, g_print ("gdk_window_set_skip_taskbar_hint: %p %s\n",
+			   GDK_WINDOW_HWND (window),
+			   skips_taskbar ? "TRUE" : "FALSE"));
+
+  extended_style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
+
+  if (skips_taskbar)
+    extended_style |= WS_EX_TOOLWINDOW;
+  else
+    extended_style &= ~WS_EX_TOOLWINDOW;
+
+  SetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE, extended_style);
 }
 
 void
@@ -2579,6 +2594,8 @@ gdk_window_set_type_hint (GdkWindow        *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
+  GDK_NOTE (MISC, g_print ("gdk_window_set_type_hint: %p %d\n",
+			   GDK_WINDOW_HWND (window), hint));
   switch (hint)
     {
     case GDK_WINDOW_TYPE_HINT_DIALOG:
@@ -2591,6 +2608,15 @@ gdk_window_set_type_hint (GdkWindow        *window,
 				  GDK_DECOR_MAXIMIZE);
       break;
     case GDK_WINDOW_TYPE_HINT_TOOLBAR:
+      gdk_window_set_skip_taskbar_hint (window, TRUE);
+      break;
+    case GDK_WINDOW_TYPE_HINT_UTILITY:
+      break;
+    case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
+      break;
+    case GDK_WINDOW_TYPE_HINT_DOCK:
+      break;
+    case GDK_WINDOW_TYPE_HINT_DESKTOP:
       break;
     default:
       g_warning ("Unknown hint %d passed to gdk_window_set_type_hint", hint);
@@ -2598,11 +2624,6 @@ gdk_window_set_type_hint (GdkWindow        *window,
     case GDK_WINDOW_TYPE_HINT_NORMAL:
       break;
     }
-  /*
-   * XXX ???
-   */
-  GDK_NOTE (MISC, g_print ("gdk_window_set_type_hint: %p\n",
-			   GDK_WINDOW_HWND (window)));
 }
 
 void
diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
index e7c0cd57cf..40f96cfc7f 100755
--- a/gtk-zip.sh.in
+++ b/gtk-zip.sh.in
@@ -26,6 +26,8 @@ zip -r $DEVZIP -@ <<EOF
 include/gtk-2.0
 bin/gdk-pixbuf-csource.exe
 bin/gdk-pixbuf-query-loaders.exe
+bin/gtk-query-immodules-2.0.exe
+bin/gtk-demo.exe
 man/man1/gdk-pixbuf-csource.1
 lib/libgdk_pixbuf-@GTK_API_VERSION@.dll.a
 lib/gdk_pixbuf-@GTK_API_VERSION@.lib
@@ -40,5 +42,6 @@ lib/pkgconfig/gdk-win32-2.0.pc
 lib/pkgconfig/gtk+-2.0.pc
 lib/pkgconfig/gtk+-win32-2.0.pc
 share/aclocal/gtk-2.0.m4
+share/gtk-2.0
 EOF
 
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
  */