updated for win32 msvc build

ChangeLog

@@ -1,3 +1,42 @@
+2001-02-19  Hans Breuer <hans@breuer.org>
+
+	* gtk/gtk.def : updated exported symbols
+
+	* gtk/makefile.msc.in : updated
+
+	* gtk/gtkstyle.c (gtk_style_realize) : gets called without
+	a colormap, when invoked from testgtk::entry. I'm not sure where
+	the bug is, but g_return_if_fail (GDK_IS_COLORMAP (colormap));
+	avoids immediate crashing ...
+
+	* gtk/gtkmain.c (check_setugid) : totally disabled on win32;
+	any objections ?
+
+	* gtk/gtktreemodel.c : called G_VALUE_LCOPY with an extra
+	0 parameter. At least msvc doesn't like macros with var args. 
+	I simply removed the extra 0, was it a feature or a typo ?
+
+	* gtk/gtktreeviewcolumn.[hc] (gtk_tree_view_column_set_func) :
+	removed the extra indirection from the GtkTreeViewColumnFunc parameter,
+	because the value assignment to the internal struct wasn't working.
+	I'm not absolutely sure. The problem could have been resolved by
+	changing the "func" declartion in the struct, but was the pointer
+	to the function pointer intended ?
+
+	* gtk+/gtk/gtktreedatalist.c : include gboxed.h
+
+	* gdk/gdk.def : updated exported symbols
+
+	* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_image) :
+	only use SetDIBitsToDevice if there is a palette at the drawable
+	and the image is GDK_VISUAL_PSEUDO_COLOR
+
+	* gdk/win32/gdkkeys-win32.c : msvc still has no <unistd.h> ...
+
+	* gdk/win32/gdkwindow-win32.c : #include "gdk.h" /* gdk_rectangle_intersect */
+
+	* gdk/*/makefile.msc : updated
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
 	* demos/gtk-demo/Makefile.am (INCLUDES): GDK_DISABLE_COMPAT_H,

ChangeLog.pre-2-0

@@ -1,3 +1,42 @@
+2001-02-19  Hans Breuer <hans@breuer.org>
+
+	* gtk/gtk.def : updated exported symbols
+
+	* gtk/makefile.msc.in : updated
+
+	* gtk/gtkstyle.c (gtk_style_realize) : gets called without
+	a colormap, when invoked from testgtk::entry. I'm not sure where
+	the bug is, but g_return_if_fail (GDK_IS_COLORMAP (colormap));
+	avoids immediate crashing ...
+
+	* gtk/gtkmain.c (check_setugid) : totally disabled on win32;
+	any objections ?
+
+	* gtk/gtktreemodel.c : called G_VALUE_LCOPY with an extra
+	0 parameter. At least msvc doesn't like macros with var args. 
+	I simply removed the extra 0, was it a feature or a typo ?
+
+	* gtk/gtktreeviewcolumn.[hc] (gtk_tree_view_column_set_func) :
+	removed the extra indirection from the GtkTreeViewColumnFunc parameter,
+	because the value assignment to the internal struct wasn't working.
+	I'm not absolutely sure. The problem could have been resolved by
+	changing the "func" declartion in the struct, but was the pointer
+	to the function pointer intended ?
+
+	* gtk+/gtk/gtktreedatalist.c : include gboxed.h
+
+	* gdk/gdk.def : updated exported symbols
+
+	* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_image) :
+	only use SetDIBitsToDevice if there is a palette at the drawable
+	and the image is GDK_VISUAL_PSEUDO_COLOR
+
+	* gdk/win32/gdkkeys-win32.c : msvc still has no <unistd.h> ...
+
+	* gdk/win32/gdkwindow-win32.c : #include "gdk.h" /* gdk_rectangle_intersect */
+
+	* gdk/*/makefile.msc : updated
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
 	* demos/gtk-demo/Makefile.am (INCLUDES): GDK_DISABLE_COMPAT_H,

ChangeLog.pre-2-10

@@ -1,3 +1,42 @@
+2001-02-19  Hans Breuer <hans@breuer.org>
+
+	* gtk/gtk.def : updated exported symbols
+
+	* gtk/makefile.msc.in : updated
+
+	* gtk/gtkstyle.c (gtk_style_realize) : gets called without
+	a colormap, when invoked from testgtk::entry. I'm not sure where
+	the bug is, but g_return_if_fail (GDK_IS_COLORMAP (colormap));
+	avoids immediate crashing ...
+
+	* gtk/gtkmain.c (check_setugid) : totally disabled on win32;
+	any objections ?
+
+	* gtk/gtktreemodel.c : called G_VALUE_LCOPY with an extra
+	0 parameter. At least msvc doesn't like macros with var args. 
+	I simply removed the extra 0, was it a feature or a typo ?
+
+	* gtk/gtktreeviewcolumn.[hc] (gtk_tree_view_column_set_func) :
+	removed the extra indirection from the GtkTreeViewColumnFunc parameter,
+	because the value assignment to the internal struct wasn't working.
+	I'm not absolutely sure. The problem could have been resolved by
+	changing the "func" declartion in the struct, but was the pointer
+	to the function pointer intended ?
+
+	* gtk+/gtk/gtktreedatalist.c : include gboxed.h
+
+	* gdk/gdk.def : updated exported symbols
+
+	* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_image) :
+	only use SetDIBitsToDevice if there is a palette at the drawable
+	and the image is GDK_VISUAL_PSEUDO_COLOR
+
+	* gdk/win32/gdkkeys-win32.c : msvc still has no <unistd.h> ...
+
+	* gdk/win32/gdkwindow-win32.c : #include "gdk.h" /* gdk_rectangle_intersect */
+
+	* gdk/*/makefile.msc : updated
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
 	* demos/gtk-demo/Makefile.am (INCLUDES): GDK_DISABLE_COMPAT_H,

ChangeLog.pre-2-2

@@ -1,3 +1,42 @@
+2001-02-19  Hans Breuer <hans@breuer.org>
+
+	* gtk/gtk.def : updated exported symbols
+
+	* gtk/makefile.msc.in : updated
+
+	* gtk/gtkstyle.c (gtk_style_realize) : gets called without
+	a colormap, when invoked from testgtk::entry. I'm not sure where
+	the bug is, but g_return_if_fail (GDK_IS_COLORMAP (colormap));
+	avoids immediate crashing ...
+
+	* gtk/gtkmain.c (check_setugid) : totally disabled on win32;
+	any objections ?
+
+	* gtk/gtktreemodel.c : called G_VALUE_LCOPY with an extra
+	0 parameter. At least msvc doesn't like macros with var args. 
+	I simply removed the extra 0, was it a feature or a typo ?
+
+	* gtk/gtktreeviewcolumn.[hc] (gtk_tree_view_column_set_func) :
+	removed the extra indirection from the GtkTreeViewColumnFunc parameter,
+	because the value assignment to the internal struct wasn't working.
+	I'm not absolutely sure. The problem could have been resolved by
+	changing the "func" declartion in the struct, but was the pointer
+	to the function pointer intended ?
+
+	* gtk+/gtk/gtktreedatalist.c : include gboxed.h
+
+	* gdk/gdk.def : updated exported symbols
+
+	* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_image) :
+	only use SetDIBitsToDevice if there is a palette at the drawable
+	and the image is GDK_VISUAL_PSEUDO_COLOR
+
+	* gdk/win32/gdkkeys-win32.c : msvc still has no <unistd.h> ...
+
+	* gdk/win32/gdkwindow-win32.c : #include "gdk.h" /* gdk_rectangle_intersect */
+
+	* gdk/*/makefile.msc : updated
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
 	* demos/gtk-demo/Makefile.am (INCLUDES): GDK_DISABLE_COMPAT_H,

ChangeLog.pre-2-4

@@ -1,3 +1,42 @@
+2001-02-19  Hans Breuer <hans@breuer.org>
+
+	* gtk/gtk.def : updated exported symbols
+
+	* gtk/makefile.msc.in : updated
+
+	* gtk/gtkstyle.c (gtk_style_realize) : gets called without
+	a colormap, when invoked from testgtk::entry. I'm not sure where
+	the bug is, but g_return_if_fail (GDK_IS_COLORMAP (colormap));
+	avoids immediate crashing ...
+
+	* gtk/gtkmain.c (check_setugid) : totally disabled on win32;
+	any objections ?
+
+	* gtk/gtktreemodel.c : called G_VALUE_LCOPY with an extra
+	0 parameter. At least msvc doesn't like macros with var args. 
+	I simply removed the extra 0, was it a feature or a typo ?
+
+	* gtk/gtktreeviewcolumn.[hc] (gtk_tree_view_column_set_func) :
+	removed the extra indirection from the GtkTreeViewColumnFunc parameter,
+	because the value assignment to the internal struct wasn't working.
+	I'm not absolutely sure. The problem could have been resolved by
+	changing the "func" declartion in the struct, but was the pointer
+	to the function pointer intended ?
+
+	* gtk+/gtk/gtktreedatalist.c : include gboxed.h
+
+	* gdk/gdk.def : updated exported symbols
+
+	* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_image) :
+	only use SetDIBitsToDevice if there is a palette at the drawable
+	and the image is GDK_VISUAL_PSEUDO_COLOR
+
+	* gdk/win32/gdkkeys-win32.c : msvc still has no <unistd.h> ...
+
+	* gdk/win32/gdkwindow-win32.c : #include "gdk.h" /* gdk_rectangle_intersect */
+
+	* gdk/*/makefile.msc : updated
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
 	* demos/gtk-demo/Makefile.am (INCLUDES): GDK_DISABLE_COMPAT_H,

ChangeLog.pre-2-6

@@ -1,3 +1,42 @@
+2001-02-19  Hans Breuer <hans@breuer.org>
+
+	* gtk/gtk.def : updated exported symbols
+
+	* gtk/makefile.msc.in : updated
+
+	* gtk/gtkstyle.c (gtk_style_realize) : gets called without
+	a colormap, when invoked from testgtk::entry. I'm not sure where
+	the bug is, but g_return_if_fail (GDK_IS_COLORMAP (colormap));
+	avoids immediate crashing ...
+
+	* gtk/gtkmain.c (check_setugid) : totally disabled on win32;
+	any objections ?
+
+	* gtk/gtktreemodel.c : called G_VALUE_LCOPY with an extra
+	0 parameter. At least msvc doesn't like macros with var args. 
+	I simply removed the extra 0, was it a feature or a typo ?
+
+	* gtk/gtktreeviewcolumn.[hc] (gtk_tree_view_column_set_func) :
+	removed the extra indirection from the GtkTreeViewColumnFunc parameter,
+	because the value assignment to the internal struct wasn't working.
+	I'm not absolutely sure. The problem could have been resolved by
+	changing the "func" declartion in the struct, but was the pointer
+	to the function pointer intended ?
+
+	* gtk+/gtk/gtktreedatalist.c : include gboxed.h
+
+	* gdk/gdk.def : updated exported symbols
+
+	* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_image) :
+	only use SetDIBitsToDevice if there is a palette at the drawable
+	and the image is GDK_VISUAL_PSEUDO_COLOR
+
+	* gdk/win32/gdkkeys-win32.c : msvc still has no <unistd.h> ...
+
+	* gdk/win32/gdkwindow-win32.c : #include "gdk.h" /* gdk_rectangle_intersect */
+
+	* gdk/*/makefile.msc : updated
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
 	* demos/gtk-demo/Makefile.am (INCLUDES): GDK_DISABLE_COMPAT_H,

ChangeLog.pre-2-8

@@ -1,3 +1,42 @@
+2001-02-19  Hans Breuer <hans@breuer.org>
+
+	* gtk/gtk.def : updated exported symbols
+
+	* gtk/makefile.msc.in : updated
+
+	* gtk/gtkstyle.c (gtk_style_realize) : gets called without
+	a colormap, when invoked from testgtk::entry. I'm not sure where
+	the bug is, but g_return_if_fail (GDK_IS_COLORMAP (colormap));
+	avoids immediate crashing ...
+
+	* gtk/gtkmain.c (check_setugid) : totally disabled on win32;
+	any objections ?
+
+	* gtk/gtktreemodel.c : called G_VALUE_LCOPY with an extra
+	0 parameter. At least msvc doesn't like macros with var args. 
+	I simply removed the extra 0, was it a feature or a typo ?
+
+	* gtk/gtktreeviewcolumn.[hc] (gtk_tree_view_column_set_func) :
+	removed the extra indirection from the GtkTreeViewColumnFunc parameter,
+	because the value assignment to the internal struct wasn't working.
+	I'm not absolutely sure. The problem could have been resolved by
+	changing the "func" declartion in the struct, but was the pointer
+	to the function pointer intended ?
+
+	* gtk+/gtk/gtktreedatalist.c : include gboxed.h
+
+	* gdk/gdk.def : updated exported symbols
+
+	* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_image) :
+	only use SetDIBitsToDevice if there is a palette at the drawable
+	and the image is GDK_VISUAL_PSEUDO_COLOR
+
+	* gdk/win32/gdkkeys-win32.c : msvc still has no <unistd.h> ...
+
+	* gdk/win32/gdkwindow-win32.c : #include "gdk.h" /* gdk_rectangle_intersect */
+
+	* gdk/*/makefile.msc : updated
+
 2001-02-19  Havoc Pennington  <hp@redhat.com>
 
 	* demos/gtk-demo/Makefile.am (INCLUDES): GDK_DISABLE_COMPAT_H,

gdk/gdk.def

@@ -66,6 +66,7 @@ EXPORTS
 	gdk_draw_indexed_image
 	gdk_draw_layout
 	gdk_draw_layout_line
+	gdk_draw_layout_with_colors
 	gdk_draw_line
 	gdk_draw_lines
 	gdk_draw_point
@@ -215,6 +216,7 @@ EXPORTS
 	gdk_pango_attr_stipple_new
 	gdk_pango_context_get
 	gdk_pango_context_set_colormap
+	gdk_pango_layout_get_clip_region
 	gdk_parent_root
 	gdk_pixbuf_get_from_drawable
 	gdk_pixbuf_render_pixmap_and_mask

gdk/makefile.msc

@@ -34,6 +34,7 @@ LDFLAGS = /link $(LINKDEBUG)
 
 # overwrite version?
 GTK_VER=1.3
+GDK_PIXBUF_VER=$(GTK_VER)
 
 CFLAGS = -I . -I .. $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \
 		-DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"
@@ -43,7 +44,7 @@ EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
 all: \
 	..\config.h \
 	gdkconfig.h \
-	gdk-$(GTK_VER).dll \
+	gdk-win32-$(GTK_VER).dll \
 	testgdk.exe
 
 gdk_OBJECTS = \
@@ -59,30 +60,32 @@ gdk_OBJECTS = \
 	gdkkeys.obj \
 	gdkkeyuni.obj \
 	gdkpango.obj \
-	gdkpixmap.obj \
+	gdkpixbuf-drawable.obj \
-	gdkregion-generic.obj \
 	gdkpixbuf-render.obj \
+	gdkpixmap.obj \
 	gdkpolyreg-generic.obj \
-	gdkrgb.obj \
 	gdkrectangle.obj \
+	gdkregion-generic.obj \
+	gdkrgb.obj \
 	gdkwindow.obj
 
+
 ..\config.h : ..\config.h.win32
 	copy ..\config.h.win32 ..\config.h
 
 gdkconfig.h : gdkconfig.h.win32
 	copy gdkconfig.h.win32 gdkconfig.h
 
-gdk-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
+gdk-win32-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
-	$(CC) $(CFLAGS) -LD -Fegdk-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def
+	$(CC) $(CFLAGS) -LD -Fegdk-win32-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def
 
-testgdk.exe : gdk-$(GTK_VER).dll testgdk.obj
+testgdk.exe : gdk-win32-$(GTK_VER).dll testgdk.obj
-	$(CC) -Fetestgdk.exe testgdk.obj gdk-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS)
+	$(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS)
 
 .c.obj :
 	$(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
 
-clean:
+clean::
 	del *.dll
 	del *.obj
 	del *.lib

gdk/win32/makefile.msc

@@ -35,7 +35,6 @@ all: \
 	gdk.res
 
 gdk_win32_OBJECTS = \
-	gdkcc-win32.obj \
 	gdkcolor-win32.obj \
 	gdkcursor-win32.obj \
 	gdkdnd-win32.obj \

gtk/gtkmain.c

@@ -202,6 +202,8 @@ static gchar *add_dll_suffix(gchar *module_name)
 static gboolean
 check_setugid (void)
 {
+/* this isn't at all relevant on Windoze and doesn't compile ... --hb */
+#ifndef G_OS_WIN32
   uid_t ruid, euid, suid; /* Real, effective and saved user ID's */
   gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */
   
@@ -231,7 +233,7 @@ check_setugid (void)
 		 "Refusing to initialize GTK+.");
       exit (1);
     }
-
+#endif
   return TRUE;
 }
 

gtk/gtkstyle.c

@@ -659,6 +659,7 @@ gtk_style_realize (GtkStyle    *style,
                    GdkColormap *colormap)
 {
   g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GDK_IS_COLORMAP (colormap));
   
   style->colormap = gdk_colormap_ref (colormap);
   style->depth = gdk_colormap_get_visual (colormap)->depth;

gtk/gtktreedatalist.c

@@ -18,6 +18,7 @@
  */
 
 #include "gtktreedatalist.h"
+#include "gobject/gboxed.h"
 #include "gobject/gvalue.h"
 #include "gobject/gvaluetypes.h"
 

gtk/gtktreemodel.c

@@ -1199,7 +1199,7 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
 
       gtk_tree_model_get_value (GTK_TREE_MODEL (tree_model), iter, column, &value);
 
-      G_VALUE_LCOPY (&value, var_args, 0, &error);
+      G_VALUE_LCOPY (&value, var_args, &error);
       if (error)
 	{
 	  g_warning ("%s: %s", G_STRLOC, error);

gtk/gtktreeviewcolumn.c

@@ -643,7 +643,7 @@ gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column,
  **/
 void
 gtk_tree_view_column_set_func (GtkTreeViewColumn     *tree_column,
-			       GtkTreeViewColumnFunc *func,
+			       GtkTreeViewColumnFunc  func,
 			       gpointer               func_data,
 			       GtkDestroyNotify       destroy)
 {

gtk/gtktreeviewcolumn.h

@@ -105,7 +105,7 @@ void               gtk_tree_view_column_add_attribute       (GtkTreeViewColumn
 void               gtk_tree_view_column_set_attributes      (GtkTreeViewColumn     *tree_column,
 							     ...);
 void               gtk_tree_view_column_set_func            (GtkTreeViewColumn     *tree_column,
-							     GtkTreeViewColumnFunc *func,
+							     GtkTreeViewColumnFunc  func,
 							     gpointer               func_data,
 							     GtkDestroyNotify       destroy);
 void               gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn     *tree_column);