diff options
| author | Hans Breuer <hans@breuer.org> | 2005-09-18 12:27:12 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2005-09-18 12:27:12 +0000 |
| commit | 1127a03f71a7e775bb0e1c886fced484b34d93a8 (patch) | |
| tree | 84e403fe1511b4a105d8c2c8117e7c84ab82aab9 /gtk | |
| parent | baf847bd1ff671daef3337c64f5c439118feeff3 (diff) | |
| download | gtk+-1127a03f71a7e775bb0e1c886fced484b34d93a8.tar.gz | |
fix typo for GTK_VER; define HAVE_CONFIG_H cause gtkprogressbar.c has
2005-09-18 Hans Breuer <hans@breuer.org>
* gtk/makefile.msc.in : fix typo for GTK_VER; define HAVE_CONFIG_H
cause gtkprogressbar.c has #include <config.h> conditionally; less
noise from generated gtk.def
* gtk/stock-icons/makefile.msc gdk/makefile.msc tests/makefile.msc : updated
* gtk/gtktrayicon-win32.c : dummy implmentation to make gtk compile.
For me it works as well as the *NIX implemenation, that is not at all.
* gdk/win32/gdkproperty-win32.c : implement gdk_atom_intern_static_string()
* gdk/win32/gdkwindow-win32.c(gdk_window_set_urgency_hint) : only use
only use (WINVER >= 0x0500) when available from the SDK. Otherwise fall
back to true dynamic linking of FlashWindowEx. Makes gtk+ work on NT4.0
again - if compiled properly.
* tests/teststatusicon.c : don't use GNOME icons for testing, but icons
already coming with Gtk+. Makes it compile on win32.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/makefile.msc.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 9de1ba657a..ef14f651e5 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -10,7 +10,7 @@ TOP = ..\.. ################################################################ # Not the real version but the one used in the DLL names -GTK_VER = 2,0 +GTK_VER = 2.0 GDK_PIXBUF_VER = 2.0 @@ -31,7 +31,9 @@ DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_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 \ +DEFINES = \ + -DHAVE_CONFIG_H \ + $(G_DEBUGGING) -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear \ -DPANGO_ENABLE_BACKEND \ -DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ -DGTK_HOST=\"win32\" \ @@ -196,6 +198,7 @@ gtk_OBJECTS = \ gtksocket.obj \ gtksocket-win32.obj \ gtkspinbutton.obj \ + gtkstatusicon.obj \ gtkstyle.obj \ gtkstatusbar.obj \ gtkstock.obj \ @@ -224,6 +227,7 @@ gtk_OBJECTS = \ gtktoolbutton.obj \ gtktoolitem.obj \ gtktooltips.obj \ + gtktrayicon-win32.obj \ gtktree.obj \ gtktreedatalist.obj \ gtktreednd.obj \ @@ -276,6 +280,7 @@ gtk_public_h_sources = \ gtkcelllayout.h \ gtkcellrenderer.h \ gtkcellrendererpixbuf.h \ + gtkcellrendererkeys.h \ gtkcellrenderertext.h \ gtkcellrenderertoggle.h \ gtkcellview.h \ @@ -322,6 +327,7 @@ gtk_public_h_sources = \ gtkhscale.h \ gtkhscrollbar.h \ gtkhseparator.h \ + gtkstatusicon.h \ gtkhsv.h \ gtkiconfactory.h \ gtkicontheme.h \ |