Use -Wall. Add gdkpango-win32.o

2000-09-07  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/makefile.mingw.in: Use -Wall. Add gdkpango-win32.o

	* gdk/win32/gdkwin32.h: Add more definitions missing from the free
	w32api headers.

	* gdk/win32/gdkprivate-win32.h: Add a couple of missing
	declarations.

	* gdk/win32/gdkdrawable-win32.c: Remove gcc -Wall warnings.
	(gdk_win32_get_colormap): A line had been deleted by mistake.

	* gdk/win32/gdkevents-win32.c: Remove lint (gcc -Wall) here, too.
	(gdk_event_translate): Handle more virtual keycodes to be able to
	generate GDK events for Control-comma, Control-period, etc.

	* gtk/gtk.def: Add some missing entry points.

2000-09-07  Tor Lillqvist  <tml@iki.fi>

	* makefile.mingw.in: Use own version number for gdk-pixbuf DLLs,
	like on Unix.

2 files changed, 21 insertions, 16 deletions

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index c9b49204fc..e8bb33219d 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-07  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.mingw.in: Use own version number for gdk-pixbuf DLLs,
+	like on Unix.
+
 2000-08-12  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk_pixbuf.def: Add missing entry point.
diff --git a/gdk-pixbuf/makefile.mingw.in b/gdk-pixbuf/makefile.mingw.in
index 1f375ac7d7..aaa962f113 100644
--- a/gdk-pixbuf/makefile.mingw.in
+++ b/gdk-pixbuf/makefile.mingw.in
@@ -6,7 +6,7 @@ TOP = ../..
 include ../build/win32/make.mingw
 
 # Possibly override GTK+ version from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
+GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
 
 OPTIMIZE = -g
 
@@ -15,7 +15,7 @@ DEPCFLAGS = $(GLIB_CFLAGS)
 
 all :						\
 	../config.h				\
-	gdk_pixbuf-$(GTK_VER).dll		\
+	gdk_pixbuf-$(GDK_PIXBUF_VER).dll	\
 	pixbufloader-bmp.dll			\
 	pixbufloader-gif.dll			\
 	pixbufloader-ico.dll			\
@@ -40,8 +40,8 @@ gdk_pixbuf_OBJECTS =				\
 ../config.h : ../config.h.win32
 	cp $< $@
 
-gdk_pixbuf-$(GTK_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def
-	$(GLIB)/build-dll gdk_pixbuf $(GTK_VER) gdk_pixbuf.def $(gdk_pixbuf_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS)
+gdk_pixbuf-$(GDK_PIXBUF_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def
+	$(GLIB)/build-dll gdk_pixbuf $(GDK_PIXBUF_VER) gdk_pixbuf.def $(gdk_pixbuf_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS)
 
 pixops/libpixops.a :
 	cd pixops && $(MAKE) -f makefile.mingw libpixops.a
@@ -49,17 +49,17 @@ pixops/libpixops.a :
 pixbufloader_bmp_OBJECTS = io-bmp.o
 
 pixbufloader-bmp.dll : $(pixbufloader_bmp_OBJECTS) pixbufloader_bmp.def
-	$(GLIB)/build-dll pixbufloader-bmp - pixbufloader_bmp.def $(pixbufloader_bmp_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
+	$(GLIB)/build-dll pixbufloader-bmp - pixbufloader_bmp.def $(pixbufloader_bmp_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
 
 pixbufloader_gif_OBJECTS = io-gif.o
 
 pixbufloader-gif.dll : $(pixbufloader_gif_OBJECTS) pixbufloader_gif.def
-	$(GLIB)/build-dll pixbufloader-gif - pixbufloader_gif.def $(pixbufloader_gif_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
+	$(GLIB)/build-dll pixbufloader-gif - pixbufloader_gif.def $(pixbufloader_gif_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
 
 pixbufloader_ico_OBJECTS = io-ico.o
 
 pixbufloader-ico.dll : $(pixbufloader_ico_OBJECTS) pixbufloader_ico.def
-	$(GLIB)/build-dll pixbufloader-ico - pixbufloader_ico.def $(pixbufloader_ico_OBJECTS) -L  . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
+	$(GLIB)/build-dll pixbufloader-ico - pixbufloader_ico.def $(pixbufloader_ico_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
 
 pixbufloader_jpeg_OBJECTS = io-jpeg.o
 
@@ -67,7 +67,7 @@ io-jpeg.o : io-jpeg.c
 	$(CC) $(CFLAGS) $(JPEG_CFLAGS) -c $<
 
 pixbufloader-jpeg.dll : $(pixbufloader_jpeg_OBJECTS) pixbufloader_jpeg.def
-	$(GLIB)/build-dll pixbufloader-jpeg - pixbufloader_jpeg.def $(pixbufloader_jpeg_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(JPEG_LIBS)
+	$(GLIB)/build-dll pixbufloader-jpeg - pixbufloader_jpeg.def $(pixbufloader_jpeg_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(JPEG_LIBS)
 
 pixbufloader_png_OBJECTS = io-png.o
 
@@ -75,22 +75,22 @@ io-png.o : io-png.c
 	$(CC) $(CFLAGS) $(PNG_CFLAGS) -c $<
 
 pixbufloader-png.dll : $(pixbufloader_png_OBJECTS) pixbufloader_png.def
-	$(GLIB)/build-dll pixbufloader-png - pixbufloader_png.def $(pixbufloader_png_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(PNG_LIBS)
+	$(GLIB)/build-dll pixbufloader-png - pixbufloader_png.def $(pixbufloader_png_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(PNG_LIBS)
 
 pixbufloader_pnm_OBJECTS = io-pnm.o
 
 pixbufloader-pnm.dll : $(pixbufloader_pnm_OBJECTS) pixbufloader_pnm.def
-	$(GLIB)/build-dll pixbufloader-pnm - pixbufloader_pnm.def $(pixbufloader_pnm_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
+	$(GLIB)/build-dll pixbufloader-pnm - pixbufloader_pnm.def $(pixbufloader_pnm_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
 
 pixbufloader_ras_OBJECTS = io-ras.o
 
 pixbufloader-ras.dll : $(pixbufloader_ras_OBJECTS) pixbufloader_ras.def
-	$(GLIB)/build-dll pixbufloader-ras - pixbufloader_ras.def $(pixbufloader_ras_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
+	$(GLIB)/build-dll pixbufloader-ras - pixbufloader_ras.def $(pixbufloader_ras_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
 
 pixbufloader_tiff_OBJECTS = io-tiff.o
 
 pixbufloader-tiff.dll : $(pixbufloader_tiff_OBJECTS) pixbufloader_tiff.def
-	$(GLIB)/build-dll pixbufloader-tiff - pixbufloader_tiff.def $(pixbufloader_tiff_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS)
+	$(GLIB)/build-dll pixbufloader-tiff - pixbufloader_tiff.def $(pixbufloader_tiff_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS)
 
 io-tiff.o : io-tiff.c
 	$(CC) $(CFLAGS) $(TIFF_CFLAGS) -c $<
@@ -98,15 +98,15 @@ io-tiff.o : io-tiff.c
 pixbufloader_wbmp_OBJECTS = io-wbmp.o
 
 pixbufloader-wbmp.dll : $(pixbufloader_wbmp_OBJECTS) pixbufloader_wbmp.def
-	$(GLIB)/build-dll pixbufloader-wbmp - pixbufloader_wbmp.def $(pixbufloader_wbmp_OBJECTS) -L  . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
+	$(GLIB)/build-dll pixbufloader-wbmp - pixbufloader_wbmp.def $(pixbufloader_wbmp_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
 
 pixbufloader_xpm_OBJECTS = io-xpm.o
 
 pixbufloader-xpm.dll : $(pixbufloader_xpm_OBJECTS) pixbufloader_xpm.def
-	$(GLIB)/build-dll pixbufloader-xpm - pixbufloader_xpm.def $(pixbufloader_xpm_OBJECTS) -L  . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
+	$(GLIB)/build-dll pixbufloader-xpm - pixbufloader_xpm.def $(pixbufloader_xpm_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
 
-test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GTK_VER).dll
-	$(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GTK_VER) $(GTK_LIBS) $(GLIB_LIBS)
+test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
+	$(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GTK_LIBS) $(GLIB_LIBS)
 
 # Hack to get an updated makefile.mingw automatically after updating
 # makefile.mingw.in. Only for developer use.