updated externals

2001-09-21  Hans Breuer  <hans@breuer.org>

	* gdk/gdk.def :
	* gtk/gtk.def : updated externals

	* gtk/gtkmain.h : define get_gtk_win32_directoty ()
	* gtk/gtkmain.c (find_module) : don't use module_name after freeing it.
	Also handle that Win32 pathes cann't be hard-coded

	* gtk/gtkrc.c : use get_gtk_win32_directoty () to cleanup the various
	module, themes etc directory calculations

	* gdk/win32/gdkgeometry-win32.c : some more hacking to get coordinates
	>16 bit right. The size limit within Win9x appears _not_ to be 32767
	but slightly smaller ...

	* gdk/win32/gdkwindow-win32.c : use impl->position_info to avoid
	>16 bit clipping. Added dummy body for gdk_window_set_icon_list ()

	* gdk/win32/gdkdrawable-win32.c : implement gdk_win32_drawable_get_handle ()

	* gdk/win32/gdkevents-win32.c : some tweaking to get better expose
	handling. I'm not sure if it is better now, but at least not worse

	* gdk/win32/makefile.msc : define INSIDE_GDK_WIN32, some cleanup

	* gdk/win32/gdkwin32.h : reflect recent API restrictions

1 files changed, 15 insertions, 17 deletions

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index c83f0b1cd..ad88bc459 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -296,23 +296,21 @@ static GSList *rc_dir_stack = NULL;
 /* RC file handling */
 
 #ifdef G_OS_WIN32
-static gchar *
-get_gtk_dll_name (void)
+gchar *
+get_gtk_win32_directory (gchar *subdir)
 {
   static gchar *gtk_dll = NULL;
 
   if (!gtk_dll)
-    gtk_dll = g_strdup_printf ("gtk-%d.%d.dll", GTK_MAJOR_VERSION, GTK_MINOR_VERSION);
-
-  return gtk_dll;
-}
+    gtk_dll = g_strdup_printf ("gtk-win32-%d.%d.dll", GTK_MAJOR_VERSION, GTK_MINOR_VERSION);
 
-static gchar *
-get_themes_directory (void)
-{
-  return g_win32_get_package_installation_subdirectory (GETTEXT_PACKAGE,
-							get_gtk_dll_name (),
-							"themes");
+  if (subdir && strlen(subdir) > 0)
+    return g_win32_get_package_installation_subdirectory (GETTEXT_PACKAGE,
+							                gtk_dll,
+							                subdir);
+  else
+    return g_win32_get_package_installation_directory (GETTEXT_PACKAGE,
+							             gtk_dll);
 }
 #endif /* G_OS_WIN32 */
  
@@ -328,7 +326,7 @@ gtk_rc_make_default_dir (const gchar *type)
   else
     path = g_build_filename (GTK_LIBDIR, "gtk-2.0,", type, GTK_BINARY_VERSION, NULL);
 #else
-  path = g_build_filename (get_themes_directory (), type, NULL);
+  path = g_build_filename (get_gtk_win32_directory (""), type, NULL);
 #endif
 
   return path;
@@ -363,7 +361,7 @@ gtk_rc_get_im_module_file (void)
 #ifndef G_OS_WIN32
 	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
 #else
-        result = g_build_filename (g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()), "gtk.immodules", NULL);
+	result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL);
 #endif
     }
 
@@ -382,7 +380,7 @@ gtk_rc_get_theme_dir(void)
   else
     path = g_build_filename (GTK_DATA_PREFIX, "share", "themes", NULL);
 #else
-  path = g_strdup (get_themes_directory ());
+  path = g_build_filename (get_gtk_win32_directory (""), "themes", NULL);
 #endif
 
   return path;
@@ -412,7 +410,7 @@ gtk_rc_append_default_module_path(void)
   else
     path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_VERSION, "engines", NULL);
 #else
-  path = g_build_filename (get_themes_directory (), "engines", NULL);
+  path = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), GTK_VERSION, "engines", NULL);
 #endif
   module_path[n++] = path;
 
@@ -457,7 +455,7 @@ gtk_rc_add_initial_default_files (void)
 #ifndef G_OS_WIN32
       str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
 #else
-      str = g_build_filename (g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()), "gtkrc", NULL);
+      str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL);
 #endif
 
       gtk_rc_add_default_file (str);