diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkmain.c | 11 | ||||
| -rw-r--r-- | gtk/gtkrc.c | 2 | ||||
| -rwxr-xr-x | gtk/makefile.msc | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index fa558da93a..4b934b6b84 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -401,7 +401,18 @@ gtk_init_check (int *argc, } #ifdef ENABLE_NLS +#ifndef NATIVE_WIN32 bindtextdomain("gtk+", GTK_LOCALEDIR); +#else + { + /* GTk+ locale dir is %WinDir%\gtk\locale */ + extern char *get_gtk_sysconf_directory (); + bindtextdomain ("gtk+", g_strconcat (get_gtk_sysconf_directory (), + G_DIR_SEPARATOR_S, + "locale", + NULL)); + } +#endif #endif /* Initialize the default visual and colormap to be diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 09d22a49b8..e030d270ac 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -232,7 +232,7 @@ static GtkImageLoader image_loader = NULL; #ifdef NATIVE_WIN32 -static gchar * +gchar * get_gtk_sysconf_directory () { static gchar gtk_sysconf_dir[200]; diff --git a/gtk/makefile.msc b/gtk/makefile.msc index d1066dd280..d5e1d839f4 100755 --- a/gtk/makefile.msc +++ b/gtk/makefile.msc @@ -39,8 +39,9 @@ GTK_VER=1.3 GDKSYSDEP = ..\gdk\win32 GLIB = ..\..\glib +GETTEXT = ..\..\gettext-0.10.35 -CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -DGTK_DISABLE_COMPAT_H +CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -I$(GETTEXT)\intl -DGTK_DISABLE_COMPAT_H all : \ ..\config.h \ @@ -328,7 +329,7 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl # Linking: # gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def - $(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib $(LDFLAGS) /def:gtk.def + $(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib $(LDFLAGS) /def:gtk.def # General rule for compiling the objects into the DLL .c.obj : |