diff options
| author | Hans Breuer <hans@breuer.org> | 2001-09-21 19:58:35 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2001-09-21 19:58:35 +0000 |
| commit | 293d78778377b034b9806d79cc060193fd890ee4 (patch) | |
| tree | e6805ef4bee29896fcb80d3782522db870324bb0 /gtk/gtkmain.c | |
| parent | 35953cae924726cc248e962a9b1b67392631b7e1 (diff) | |
| download | gtk+-293d78778377b034b9806d79cc060193fd890ee4.tar.gz | |
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
Diffstat (limited to 'gtk/gtkmain.c')
| -rw-r--r-- | gtk/gtkmain.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 9eeebb7ed4..2abfb54497 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -235,8 +235,13 @@ get_module_path (void) if (exe_prefix) default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", "modules", NULL); else - default_dir = g_build_filename (GTK_LIBDIR, "gtk-2.0", "modules", NULL); - + { +#ifndef G_OS_WIN32 + default_dir = g_build_filename (GTK_LIBDIR, "gtk-2.0", "modules", NULL); +#else + default_dir = g_build_filename (get_gtk_win32_directory (""), "modules", NULL); +#endif + } module_path = g_strconcat (module_path ? module_path : "", module_path ? G_SEARCHPATH_SEPARATOR_S : "", default_dir, NULL); @@ -264,6 +269,7 @@ find_module (gchar **module_path, { gchar *version_directory; +#ifndef G_OS_WIN32 /* ignoring GTK_BINARY_VERSION elsewhere too */ version_directory = g_build_filename (module_path[i], GTK_BINARY_VERSION, NULL); module_name = g_module_build_path (version_directory, name); g_free (version_directory); @@ -275,13 +281,15 @@ find_module (gchar **module_path, } g_free (module_name); +#endif module_name = g_module_build_path (module_path[i], name); if (g_file_test (module_name, G_FILE_TEST_EXISTS)) { + module = g_module_open (module_name, G_MODULE_BIND_LAZY); g_free (module_name); - return g_module_open (module_name, G_MODULE_BIND_LAZY); + return module; } g_free (module_name); @@ -523,7 +531,7 @@ gtk_init_check (int *argc, { bindtextdomain (GETTEXT_PACKAGE, g_win32_get_package_installation_subdirectory (GETTEXT_PACKAGE, - g_strdup_printf ("gtk-%d.%d.dll", GTK_MAJOR_VERSION, GTK_MINOR_VERSION), + g_strdup_printf ("gtk-win32-%d.%d.dll", GTK_MAJOR_VERSION, GTK_MINOR_VERSION), "locale")); } #endif |