diff options
| author | Hans Breuer <hans@breuer.org> | 2008-05-23 20:29:27 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2008-05-23 20:29:27 +0000 |
| commit | 0b57c6b98f1c956c94c4ae0b0a7e4178003356a9 (patch) | |
| tree | 206a95226c97ac0563d895fb3394f5f0b8e7996e /gdk | |
| parent | a8b5f3ee6b986ef8c8aceda9a8fe9d49ac7e2387 (diff) | |
| download | gtk+-0b57c6b98f1c956c94c4ae0b0a7e4178003356a9.tar.gz | |
updated fix c99ism (variable at start of block export functions for window
2008-05-23 Hans Breuer <hans@breuer.org>
* **/makefile.msc gtk/makefile.msc.in : updated
* gtk/gtkwidget.c : fix c99ism (variable at start of block
* gdk/gdk.symbols gtk/gtk.symbols : export functions for window
redirection
* gtk/gtkfilechooserdefault.c : #include <locale.h> for
setlocale(LC_ALL, ...)
svn path=/trunk/; revision=20131
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdk.symbols | 2 | ||||
| -rw-r--r-- | gdk/makefile.msc | 25 | ||||
| -rw-r--r-- | gdk/win32/makefile.msc | 11 |
3 files changed, 26 insertions, 12 deletions
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index c4c5e7093f..91166b3d3a 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -681,7 +681,9 @@ gdk_window_object_get_type G_GNUC_CONST gdk_window_peek_children gdk_window_process_all_updates gdk_window_process_updates +gdk_window_redirect_to_drawable gdk_window_remove_filter +gdk_window_remove_redirection gdk_window_set_debug_updates gdk_window_set_user_data gdk_window_thaw_toplevel_updates_libgtk_only diff --git a/gdk/makefile.msc b/gdk/makefile.msc index 36a534227a..fb61c32a2d 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -11,7 +11,9 @@ TOP = ..\.. # Location of the Wintab toolkit. Downloadable from http://www.pointing.com. # definition should possibly go to build/win32/module.def, too. -WTKIT = ..\..\wtkit126 +!IFNDEF WTKIT +WTKIT = $(TOP)\wtkit126 +!ENDIF ############################################################### @@ -46,10 +48,12 @@ CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \ -DGDK_VERSION=\"$(GTK_VER)\" \ -DG_LOG_DOMAIN=\"Gdk\" -EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \ - ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \ - $(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \ - $(PANGOCAIRO_LIBS) +EXTRALIBS = \ + $(WTKIT)\lib\i386\wntab32x.lib \ + $(GLIB_LIBS) \ + ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \ + $(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \ + $(PANGOCAIRO_LIBS) gdk-win32-backend : cd win32 @@ -73,6 +77,7 @@ all: \ gdk_OBJECTS = \ gdk.obj \ + gdkapplaunchcontext.obj \ gdkcairo.obj \ gdkcolor.obj \ gdkcursor.obj \ @@ -134,11 +139,13 @@ gdkmarshalers.h : gdkmarshalers.list gdkmarshalers.c : gdkmarshalers.list $(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --body >gdkmarshalers.c -gdkenumtypes.h: $(gdk_public_h_sources) makeenums.pl - $(PERL) makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h +gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template + $(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.h.template \ + $(gdk_public_h_sources) > gdkenumtypes.h -gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl - $(PERL) makeenums.pl cfile $(gdk_public_h_sources) > gdkenumtypes.c +gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template + $(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.c.template \ + $(gdk_public_h_sources) > gdkenumtypes.c ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc index ce79923ef5..cb6ba5d0a5 100644 --- a/gdk/win32/makefile.msc +++ b/gdk/win32/makefile.msc @@ -1,9 +1,6 @@ ## Makefile for building the GDK DLL with Microsoft C ## Use: nmake -f makefile.msc -# Location of the Wintab toolkit. Downloadable from http://www.pointing.com. -WTKIT = ..\..\..\wtkit126 - ################################################################ # Nothing much configurable below @@ -11,6 +8,12 @@ WTKIT = ..\..\..\wtkit126 TOP = ../../.. !INCLUDE $(TOP)/glib/build/win32/make.msc +# Location of the Wintab toolkit. Downloadable from http://www.pointing.com. +# definition should possibly go to build/win32/module.def, too. +!IFNDEF WTKIT +WTKIT = $(TOP)\wtkit126 +!ENDIF + GTK_VER=2.0 CFLAGS = -FImsvc_recommended_pragmas.h \ @@ -25,6 +28,7 @@ all: \ gdk.res gdk_win32_OBJECTS = \ + gdkapplaunchcontext-win32.obj \ gdkcolor-win32.obj \ gdkcursor-win32.obj \ gdkdnd-win32.obj \ @@ -47,6 +51,7 @@ gdk_win32_OBJECTS = \ gdkscreen-win32.obj \ gdkselection-win32.obj \ gdkspawn-win32.obj \ + gdktestutils-win32.obj \ gdkvisual-win32.obj \ gdkwin32id.obj \ gdkwindow-win32.obj |