diff options
| author | Hans Breuer <hans@breuer.org> | 2002-02-27 16:37:04 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2002-02-27 16:37:04 +0000 |
| commit | bc94033dd3c2c5826557593d6d066f4d82da3eae (patch) | |
| tree | ace4dc873e402132ee41e2ffb0569621a6bc6de0 /gtk | |
| parent | 20eda0e6f12aba1b291efc33b6f23c6b32759b22 (diff) | |
| download | gtk+-bc94033dd3c2c5826557593d6d066f4d82da3eae.tar.gz | |
new file
2002-02-27 Hans Breuer <hans@breuer.org>
* demos/gtk-demo/makefile.msc.in : new file
* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
version resource
* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res
* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
(gdk_keyval_name) : fix endless looping
* gtk/gtkfilesel.c : translate_win32_path() static
* gtk/queryimmodules : print_escaped(), query_module() static
* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res
* gtk/stock-icons/makefile.msc : regenerated from directory
listing (almost all filenames changed)
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkfilesel.c | 2 | ||||
| -rw-r--r-- | gtk/makefile.msc.in | 7 | ||||
| -rw-r--r-- | gtk/queryimmodules.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 2140a4ae9e..99534e19a4 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -437,7 +437,7 @@ static gint cmpl_errno; * Return a boolean value concerning whether a * translation had to be made. */ -int +static int translate_win32_path (GtkFileSelection *filesel) { int updated = 0; diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 2a143caa22..0ca53d29d5 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -25,14 +25,16 @@ GTK_BINARY_VERSION = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@LT_CURRENT@ PERL = perl AWK = gawk -INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf -DPANGO_ENABLE_BACKEND +INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ $(INTL_CFLAGS) $(ATK_CFLAGS) LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG) # Some files use near as an identifier # Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only DEFINES = $(G_DEBUGGING) -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear \ - -DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" + -DPANGO_ENABLE_BACKEND \ + -DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ + -DGTK_HOST=\"win32\" TOUCH = copy makefile.msc+nul @@ -113,6 +115,7 @@ gtk_OBJECTS = \ gtkinvisible.obj \ gtkitem.obj \ gtkitemfactory.obj \ + gtkkeyhash.obj \ gtklabel.obj \ gtklayout.obj \ gtklist.obj \ diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c index 45ca335ba6..defdb8faf3 100644 --- a/gtk/queryimmodules.c +++ b/gtk/queryimmodules.c @@ -41,7 +41,7 @@ #include "gtk/gtkrc.h" #include "gtk/gtkimmodule.h" -void +static void print_escaped (const char *str) { char *tmp = g_strescape (str, NULL); @@ -49,7 +49,7 @@ print_escaped (const char *str) g_free (tmp); } -gboolean +static gboolean query_module (const char *dir, const char *name) { void (*list) (const GtkIMContextInfo ***contexts, |