diff options
| author | Hans Breuer <hans@breuer.org> | 2002-01-05 19:07:13 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2002-01-05 19:07:13 +0000 |
| commit | ec81d4a8af83b77eae96b908c809a81381527d1a (patch) | |
| tree | eb4b072f375157b03764b5c00efebe5a0947e654 /gtk/makefile.msc.in | |
| parent | 40cab0a2fbde365a3d436fa900b110954b648d67 (diff) | |
| download | gtk+-ec81d4a8af83b77eae96b908c809a81381527d1a.tar.gz | |
need to cast image->mem away from void* to avoid 'error C2036: 'void *' :
2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :
need to cast image->mem away from void* to avoid
'error C2036: 'void *' : unknown size'. Doing pointer
arithmetics on void pointers is a GCCism afaik.
* gdk/gdkpixbuf-render.c : #include "gdkinternals.h" for
_gdk_draw_pixbuf ()
* gdk/makefile.msc gdk/win32/makefile.msc
gdk/gtk/makefile.msc.in : use -FI msvc_recommended_pragmas.h
* gdk/win32/gdkdrawable-win32.c : use _gkd_win32_copy_to_image
and take care of image->visual possibly NULL.
* gdk/win32/gdkimage-win32.c : implement _gdk_image_new_for_depth(),
_gdk_win32_copy_to_image() and _gdk_windowing_bits_for_depth().
Again take care of image->visual possibly NULL.
* gdk/win32/gdkprivate-win32.h : declare _gdk_win32_copy_to_image()
* gdk/win32/gdkevents-win32.c : use gdk_drawable_get_colormap
instead of private field access
* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_new) : adapt
colormap setting to the gdk-X behaviour
Diffstat (limited to 'gtk/makefile.msc.in')
| -rw-r--r-- | gtk/makefile.msc.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 965dd6e9e8..2a143caa22 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -25,7 +25,7 @@ GTK_BINARY_VERSION = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@LT_CURRENT@ PERL = perl AWK = gawk -INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -DPANGO_ENABLE_BACKEND +INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf -DPANGO_ENABLE_BACKEND DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ $(INTL_CFLAGS) $(ATK_CFLAGS) LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG) @@ -133,7 +133,7 @@ gtk_OBJECTS = \ gtkoptionmenu.obj \ gtkpaned.obj \ gtkpixmap.obj \ - gtkplug.obj \ +# gtkplug.obj \ gtkpreview.obj \ gtkprogress.obj \ gtkprogressbar.obj \ @@ -152,7 +152,7 @@ gtk_OBJECTS = \ gtksettings.obj \ gtksignal.obj \ gtksizegroup.obj \ - gtksocket.obj \ +# gtksocket.obj \ gtkspinbutton.obj \ gtkstyle.obj \ gtkstatusbar.obj \ @@ -171,6 +171,7 @@ gtk_OBJECTS = \ gtktexttag.obj \ gtktexttagtable.obj \ gtktexttypes.obj \ + gtktextutil.obj \ gtktextview.obj \ gtkthemes.obj \ gtktipsquery.obj \ |