Changes by Hans Breuer:

2000-11-30  Tor Lillqvist  <tml@iki.fi>

	Changes by Hans Breuer:

	* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):
	Dont't use negative width and height as max_hints. This fixes
	Owen's recent testgtk changes for win32.

	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get,
	gdk_win32_hdc_release): These are exported and may be called with
	other drawable types than our GdkDrawableImplWin32 (?).

	* gdk/gdkwindow.c: Backing store appears to work on Windows now,
	so always #define USE_BACKING_STORE.

	* gtk/gtktextdisplay.c (render_layout_line): Use g_print instead
	of printf for debugging output.

	* gtk/gtktextlayout.c (allocate_child_widgets): Ditto.

	* gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto.

	* gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport
	declaration.

	* gtk/gtktexttypes.h: Ditto.

	* gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value
	(GDK_VoidSymbol) also if in case of arg check failure.

	* gtk/gtkimcontextsimple.c
	(gtk_im_context_simple_get_preedit_string): Don't assign cursor
	position to the pointer, but to the variable it points to.

	* gtk/makefile.msc.in (DEFINES): Define GTK_VERSION.

	* gtk/gtk.def: Updates.

19 files changed, 327 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index cbf7badc5d..496daace73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2000-11-30  Tor Lillqvist  <tml@iki.fi>
+
+	Changes by Hans Breuer:
+	
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):
+	Dont't use negative width and height as max_hints. This fixes
+	Owen's recent testgtk changes for win32.
+
+	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get,
+	gdk_win32_hdc_release): These are exported and may be called with
+	other drawable types than our GdkDrawableImplWin32 (?).
+
+	* gdk/gdkwindow.c: Backing store appears to work on Windows now,
+	so always #define USE_BACKING_STORE.
+
+	* gtk/gtktextdisplay.c (render_layout_line): Use g_print instead
+	of printf for debugging output.
+
+	* gtk/gtktextlayout.c (allocate_child_widgets): Ditto.
+	
+	* gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto.
+
+	* gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport
+	declaration.
+
+	* gtk/gtktexttypes.h: Ditto.
+
+	* gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value
+	(GDK_VoidSymbol) also if in case of arg check failure.
+
+	* gtk/gtkimcontextsimple.c
+	(gtk_im_context_simple_get_preedit_string): Don't assign cursor
+	position to the pointer, but to the variable it points to.
+
+	* gtk/makefile.msc.in (DEFINES): Define GTK_VERSION.
+
+	* gtk/gtk.def: Updates.
+
 2000-11-29  Elliot Lee  <sopwith@redhat.com>
 
 	* gtk/gtkmodelsimple.c: Inherits from GTK_TYPE_OBJECT, not
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index cbf7badc5d..496daace73 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,41 @@
+2000-11-30  Tor Lillqvist  <tml@iki.fi>
+
+	Changes by Hans Breuer:
+	
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):
+	Dont't use negative width and height as max_hints. This fixes
+	Owen's recent testgtk changes for win32.
+
+	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get,
+	gdk_win32_hdc_release): These are exported and may be called with
+	other drawable types than our GdkDrawableImplWin32 (?).
+
+	* gdk/gdkwindow.c: Backing store appears to work on Windows now,
+	so always #define USE_BACKING_STORE.
+
+	* gtk/gtktextdisplay.c (render_layout_line): Use g_print instead
+	of printf for debugging output.
+
+	* gtk/gtktextlayout.c (allocate_child_widgets): Ditto.
+	
+	* gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto.
+
+	* gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport
+	declaration.
+
+	* gtk/gtktexttypes.h: Ditto.
+
+	* gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value
+	(GDK_VoidSymbol) also if in case of arg check failure.
+
+	* gtk/gtkimcontextsimple.c
+	(gtk_im_context_simple_get_preedit_string): Don't assign cursor
+	position to the pointer, but to the variable it points to.
+
+	* gtk/makefile.msc.in (DEFINES): Define GTK_VERSION.
+
+	* gtk/gtk.def: Updates.
+
 2000-11-29  Elliot Lee  <sopwith@redhat.com>
 
 	* gtk/gtkmodelsimple.c: Inherits from GTK_TYPE_OBJECT, not
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cbf7badc5d..496daace73 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,41 @@
+2000-11-30  Tor Lillqvist  <tml@iki.fi>
+
+	Changes by Hans Breuer:
+	
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):
+	Dont't use negative width and height as max_hints. This fixes
+	Owen's recent testgtk changes for win32.
+
+	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get,
+	gdk_win32_hdc_release): These are exported and may be called with
+	other drawable types than our GdkDrawableImplWin32 (?).
+
+	* gdk/gdkwindow.c: Backing store appears to work on Windows now,
+	so always #define USE_BACKING_STORE.
+
+	* gtk/gtktextdisplay.c (render_layout_line): Use g_print instead
+	of printf for debugging output.
+
+	* gtk/gtktextlayout.c (allocate_child_widgets): Ditto.
+	
+	* gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto.
+
+	* gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport
+	declaration.
+
+	* gtk/gtktexttypes.h: Ditto.
+
+	* gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value
+	(GDK_VoidSymbol) also if in case of arg check failure.
+
+	* gtk/gtkimcontextsimple.c
+	(gtk_im_context_simple_get_preedit_string): Don't assign cursor
+	position to the pointer, but to the variable it points to.
+
+	* gtk/makefile.msc.in (DEFINES): Define GTK_VERSION.
+
+	* gtk/gtk.def: Updates.
+
 2000-11-29  Elliot Lee  <sopwith@redhat.com>
 
 	* gtk/gtkmodelsimple.c: Inherits from GTK_TYPE_OBJECT, not
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index cbf7badc5d..496daace73 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,41 @@
+2000-11-30  Tor Lillqvist  <tml@iki.fi>
+
+	Changes by Hans Breuer:
+	
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):
+	Dont't use negative width and height as max_hints. This fixes
+	Owen's recent testgtk changes for win32.
+
+	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get,
+	gdk_win32_hdc_release): These are exported and may be called with
+	other drawable types than our GdkDrawableImplWin32 (?).
+
+	* gdk/gdkwindow.c: Backing store appears to work on Windows now,
+	so always #define USE_BACKING_STORE.
+
+	* gtk/gtktextdisplay.c (render_layout_line): Use g_print instead
+	of printf for debugging output.
+
+	* gtk/gtktextlayout.c (allocate_child_widgets): Ditto.
+	
+	* gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto.
+
+	* gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport
+	declaration.
+
+	* gtk/gtktexttypes.h: Ditto.
+
+	* gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value
+	(GDK_VoidSymbol) also if in case of arg check failure.
+
+	* gtk/gtkimcontextsimple.c
+	(gtk_im_context_simple_get_preedit_string): Don't assign cursor
+	position to the pointer, but to the variable it points to.
+
+	* gtk/makefile.msc.in (DEFINES): Define GTK_VERSION.
+
+	* gtk/gtk.def: Updates.
+
 2000-11-29  Elliot Lee  <sopwith@redhat.com>
 
 	* gtk/gtkmodelsimple.c: Inherits from GTK_TYPE_OBJECT, not
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cbf7badc5d..496daace73 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,41 @@
+2000-11-30  Tor Lillqvist  <tml@iki.fi>
+
+	Changes by Hans Breuer:
+	
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):
+	Dont't use negative width and height as max_hints. This fixes
+	Owen's recent testgtk changes for win32.
+
+	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get,
+	gdk_win32_hdc_release): These are exported and may be called with
+	other drawable types than our GdkDrawableImplWin32 (?).
+
+	* gdk/gdkwindow.c: Backing store appears to work on Windows now,
+	so always #define USE_BACKING_STORE.
+
+	* gtk/gtktextdisplay.c (render_layout_line): Use g_print instead
+	of printf for debugging output.
+
+	* gtk/gtktextlayout.c (allocate_child_widgets): Ditto.
+	
+	* gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto.
+
+	* gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport
+	declaration.
+
+	* gtk/gtktexttypes.h: Ditto.
+
+	* gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value
+	(GDK_VoidSymbol) also if in case of arg check failure.
+
+	* gtk/gtkimcontextsimple.c
+	(gtk_im_context_simple_get_preedit_string): Don't assign cursor
+	position to the pointer, but to the variable it points to.
+
+	* gtk/makefile.msc.in (DEFINES): Define GTK_VERSION.
+
+	* gtk/gtk.def: Updates.
+
 2000-11-29  Elliot Lee  <sopwith@redhat.com>
 
 	* gtk/gtkmodelsimple.c: Inherits from GTK_TYPE_OBJECT, not
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cbf7badc5d..496daace73 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,41 @@
+2000-11-30  Tor Lillqvist  <tml@iki.fi>
+
+	Changes by Hans Breuer:
+	
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):
+	Dont't use negative width and height as max_hints. This fixes
+	Owen's recent testgtk changes for win32.
+
+	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get,
+	gdk_win32_hdc_release): These are exported and may be called with
+	other drawable types than our GdkDrawableImplWin32 (?).
+
+	* gdk/gdkwindow.c: Backing store appears to work on Windows now,
+	so always #define USE_BACKING_STORE.
+
+	* gtk/gtktextdisplay.c (render_layout_line): Use g_print instead
+	of printf for debugging output.
+
+	* gtk/gtktextlayout.c (allocate_child_widgets): Ditto.
+	
+	* gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto.
+
+	* gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport
+	declaration.
+
+	* gtk/gtktexttypes.h: Ditto.
+
+	* gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value
+	(GDK_VoidSymbol) also if in case of arg check failure.
+
+	* gtk/gtkimcontextsimple.c
+	(gtk_im_context_simple_get_preedit_string): Don't assign cursor
+	position to the pointer, but to the variable it points to.
+
+	* gtk/makefile.msc.in (DEFINES): Define GTK_VERSION.
+
+	* gtk/gtk.def: Updates.
+
 2000-11-29  Elliot Lee  <sopwith@redhat.com>
 
 	* gtk/gtkmodelsimple.c: Inherits from GTK_TYPE_OBJECT, not
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cbf7badc5d..496daace73 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,41 @@
+2000-11-30  Tor Lillqvist  <tml@iki.fi>
+
+	Changes by Hans Breuer:
+	
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):
+	Dont't use negative width and height as max_hints. This fixes
+	Owen's recent testgtk changes for win32.
+
+	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get,
+	gdk_win32_hdc_release): These are exported and may be called with
+	other drawable types than our GdkDrawableImplWin32 (?).
+
+	* gdk/gdkwindow.c: Backing store appears to work on Windows now,
+	so always #define USE_BACKING_STORE.
+
+	* gtk/gtktextdisplay.c (render_layout_line): Use g_print instead
+	of printf for debugging output.
+
+	* gtk/gtktextlayout.c (allocate_child_widgets): Ditto.
+	
+	* gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto.
+
+	* gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport
+	declaration.
+
+	* gtk/gtktexttypes.h: Ditto.
+
+	* gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value
+	(GDK_VoidSymbol) also if in case of arg check failure.
+
+	* gtk/gtkimcontextsimple.c
+	(gtk_im_context_simple_get_preedit_string): Don't assign cursor
+	position to the pointer, but to the variable it points to.
+
+	* gtk/makefile.msc.in (DEFINES): Define GTK_VERSION.
+
+	* gtk/gtk.def: Updates.
+
 2000-11-29  Elliot Lee  <sopwith@redhat.com>
 
 	* gtk/gtkmodelsimple.c: Inherits from GTK_TYPE_OBJECT, not
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 291830e219..be6e8d0135 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -31,11 +31,7 @@
 #include "gdkdrawable.h"
 #include "gdkpixmap.h"
 
-#ifndef USE_BACKING_STORE
-#ifndef GDK_WINDOWING_WIN32
-#define USE_BACKING_STORE	/* Doesn't work yet on Win32 */
-#endif
-#endif
+#define USE_BACKING_STORE	/* Appears to work on Win32, too, now. */
 
 typedef struct _GdkWindowPaint GdkWindowPaint;
 
diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index 9482fa0914..756a3efa08 100644
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -961,14 +961,22 @@ gdk_win32_hdc_get (GdkDrawable    *drawable,
 		   GdkGCValuesMask usage)
 {
   GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
+  GdkDrawableImplWin32 *impl;
   gboolean ok = TRUE;
   int flag;
 
   g_assert (win32_gc->hdc == NULL);
 
-  win32_gc->hwnd = GDK_DRAWABLE_IMPL_WIN32(drawable)->handle;
+  if (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable))
+    impl = GDK_DRAWABLE_IMPL_WIN32(drawable);
+  else if (GDK_IS_WINDOW (drawable))
+    impl = ((GdkWindowObject *) drawable)->impl;
+  else if (GDK_IS_PIXMAP (drawable))
+    impl = ((GdkPixmapObject *) drawable)->impl;
 
-  if (GDK_IS_PIXMAP_IMPL_WIN32 (drawable))
+  win32_gc->hwnd = impl->handle;
+
+  if (GDK_IS_PIXMAP_IMPL_WIN32 (impl))
     {
       if ((win32_gc->hdc = CreateCompatibleDC (NULL)) == NULL)
 	WIN32_GDI_FAILED ("CreateCompatibleDC"), ok = FALSE;
@@ -989,12 +997,12 @@ gdk_win32_hdc_get (GdkDrawable    *drawable,
     }
   
   if (ok && (usage & GDK_GC_FOREGROUND))
-    predraw_set_foreground (gc, GDK_DRAWABLE_IMPL_WIN32 (drawable)->colormap, &ok);
+    predraw_set_foreground (gc, impl->colormap, &ok);
 
   if (ok
       && (usage & GDK_GC_BACKGROUND)
       && (win32_gc->values_mask & GDK_GC_BACKGROUND))
-    predraw_set_background (gc, GDK_DRAWABLE_IMPL_WIN32 (drawable)->colormap, &ok);
+    predraw_set_background (gc, impl->colormap, &ok);
   
   if (ok && (usage & GDK_GC_FONT))
     {
@@ -1148,9 +1156,17 @@ gdk_win32_hdc_release (GdkDrawable    *drawable,
 		       GdkGCValuesMask usage)
 {
   GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
+  GdkDrawableImplWin32 *impl;
   HGDIOBJ hpen = NULL;
   HGDIOBJ hbr = NULL;
 
+  if (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable))
+    impl = GDK_DRAWABLE_IMPL_WIN32(drawable);
+  else if (GDK_IS_WINDOW (drawable))
+    impl = ((GdkWindowObject *) drawable)->impl;
+  else if (GDK_IS_PIXMAP (drawable))
+    impl = ((GdkPixmapObject *) drawable)->impl;
+
   if (usage & GDK_GC_FOREGROUND)
     {
       if ((hpen = GetCurrentObject (win32_gc->hdc, OBJ_PEN)) == NULL)
@@ -1172,7 +1188,7 @@ gdk_win32_hdc_release (GdkDrawable    *drawable,
 	WIN32_GDI_FAILED ("UnrealizeObject");
     }
 #endif
-  if (GDK_IS_PIXMAP_IMPL_WIN32 (drawable))
+  if (GDK_IS_PIXMAP_IMPL_WIN32 (impl))
     {
       if (!DeleteDC (win32_gc->hdc))
 	WIN32_GDI_FAILED ("DeleteDC");
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 3d971e8657..629c73092b 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -179,6 +179,7 @@ gdk_window_impl_win32_set_colormap (GdkDrawable *drawable,
   GDK_DRAWABLE_GET_CLASS (draw_impl)->set_colormap (drawable, cmap);
   
   /* XXX */
+  g_print("gdk_window_impl_win32_set_colormap: XXX\n");
 }
 
 static void
@@ -1313,9 +1314,13 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
       rect.bottom = geometry->max_height;
       dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
       dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
-      AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
+      /* HB: dont' know why AdjustWindowRectEx is called here, ... */
+      SafeAdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
       impl->hint_max_width = rect.right - rect.left;
       impl->hint_max_height = rect.bottom - rect.top;
+      /* ... but negative sizes are always wrong */
+      if (impl->hint_max_width < 0) impl->hint_max_width = G_MAXSHORT;
+      if (impl->hint_max_height < 0) impl->hint_max_height = G_MAXSHORT;
 
       /* Again, check if the window is too large currently. */
       GetClientRect (GDK_WINDOW_HWND (window), &rect);
diff --git a/gtk/gtk.def b/gtk/gtk.def
index 77d2766719..4bf9fbff15 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -857,6 +857,7 @@ EXPORTS
 	gtk_object_constructed
 	gtk_object_default_construct
 	gtk_object_destroy
+	gtk_object_get
 	gtk_object_get_data
 	gtk_object_get_data_by_id
 	gtk_object_get_type
@@ -1179,8 +1180,9 @@ EXPORTS
 	gtk_text_buffer_remove_tag_by_name
 	gtk_text_buffer_set_modified
 	gtk_text_byte_begins_utf8_char
-	gtk_text_char_type
-	gtk_text_child_type
+	gtk_text_child_anchor_get_deleted
+	gtk_text_child_anchor_get_type
+	gtk_text_child_anchor_get_widgets
 	gtk_text_forward_delete
 	gtk_text_freeze
 	gtk_text_get_length
@@ -1212,10 +1214,8 @@ EXPORTS
 	gtk_text_iter_reorder
 	gtk_text_iter_spew
 	gtk_text_iter_toggles_tag
-	gtk_text_left_mark_type
 	gtk_text_new
 	gtk_text_pixbuf_type
-	gtk_text_right_mark_type
 	gtk_text_set_adjustments
 	gtk_text_set_editable
 	gtk_text_set_line_wrap
@@ -1223,10 +1223,10 @@ EXPORTS
 	gtk_text_set_word_wrap
 	gtk_text_tag_get_type
 	gtk_text_tag_table_lookup
-	gtk_text_toggle_off_type
-	gtk_text_toggle_on_type
 	gtk_text_thaw
 	gtk_text_unknown_char_utf8
+	gtk_text_view_add_child_at_anchor
+	gtk_text_view_add_child_in_window
 	gtk_text_view_buffer_to_window_coords
 	gtk_text_view_get_buffer
 	gtk_text_view_get_editable
@@ -1243,6 +1243,7 @@ EXPORTS
 	gtk_text_view_get_type
 	gtk_text_view_get_window
 	gtk_text_view_get_wrap_mode
+	gtk_text_view_move_child
 	gtk_text_view_new_with_buffer
 	gtk_text_view_set_border_window_size
 	gtk_text_view_set_cursor_visible
@@ -1445,6 +1446,7 @@ EXPORTS
 	gtk_widget_set_default_direction
 	gtk_widget_set_default_style
 	gtk_widget_set_direction
+	gtk_widget_set_double_buffered
 	gtk_widget_set_events
 	gtk_widget_set_extension_events
 	gtk_widget_set_name
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 1c56d5204f..35ecaefffe 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -1039,7 +1039,7 @@ gtk_im_context_simple_get_preedit_string (GtkIMContext   *context,
     }
 
   if (cursor_pos)
-    cursor_pos = context_simple->tentative_match ? 1 : 0;
+    *cursor_pos = context_simple->tentative_match ? 1 : 0;
 }
 
 /**
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 40f416ce7e..ab5c2cf4c1 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -323,7 +323,7 @@ guint
 gtk_label_set_markup_with_accel (GtkLabel    *label,
                                  const gchar *str)
 {
-  g_return_if_fail (GTK_IS_LABEL (label));
+  g_return_val_if_fail (GTK_IS_LABEL (label), GDK_VoidSymbol);
 
   return set_markup (label, str, TRUE);
 }
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 7383788564..9229b74351 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -60,7 +60,7 @@ typedef gint	(*GtkKeySnoopFunc)	(GtkWidget	*grab_widget,
 #ifdef GTK_COMPILATION
 #define GTKMAIN_C_VAR __declspec(dllexport)
 #else
-#define GTKMAIN_C_VAR __declspec(dllimport) extern
+#define GTKMAIN_C_VAR extern __declspec(dllimport)
 #endif
 #else
 #define GTKMAIN_C_VAR extern
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 46aa9d7936..e5a6d3b721 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -371,11 +371,11 @@ render_layout_line (GdkDrawable        *drawable,
               width = widget->allocation.width;
               height = widget->allocation.height;
 
-              printf ("widget allocation at %d,%d %d x %d\n",
-                      widget->allocation.x,
-                      widget->allocation.y,
-                      widget->allocation.width,
-                      widget->allocation.height);
+              g_print ("widget allocation at %d,%d %d x %d\n",
+		       widget->allocation.x,
+		       widget->allocation.y,
+		       widget->allocation.width,
+		       widget->allocation.height);
               
               if (GTK_WIDGET_DRAWABLE (widget) &&
                   gdk_rectangle_intersect (&widget->allocation,
@@ -383,11 +383,11 @@ render_layout_line (GdkDrawable        *drawable,
                                            &draw_rect))
 
                 {
-                  printf ("drawing widget area %d,%d %d x %d\n",
-                          draw_rect.x,
-                          draw_rect.y,
-                          draw_rect.width,
-                          draw_rect.height);
+                  g_print ("drawing widget area %d,%d %d x %d\n",
+			   draw_rect.x,
+			   draw_rect.y,
+			   draw_rect.width,
+			   draw_rect.height);
 
                   gtk_widget_draw (widget, &draw_rect);
                 }
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 82fca81265..c43320e505 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1481,7 +1481,7 @@ allocate_child_widgets (GtkTextLayout      *text_layout,
                                                  NULL,
                                                  &extents);
 
-              printf ("extents at %d,%d\n", extents.x, extents.y);
+              g_print ("extents at %d,%d\n", extents.x, extents.y);
               
               gtk_signal_emit (GTK_OBJECT (text_layout),
                                signals[ALLOCATE_CHILD],
diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
index 76f7287f0a..1dad226180 100644
--- a/gtk/gtktexttypes.h
+++ b/gtk/gtktexttypes.h
@@ -25,24 +25,24 @@ typedef struct _GtkTextMarkBody GtkTextMarkBody;
 #ifdef GTK_COMPILATION
 #define VARIABLE __declspec(dllexport)
 #else
-#define VARIABLE __declspec(dllimport) extern
+#define VARIABLE extern __declspec(dllimport)
 #endif
 #else
 #define VARIABLE extern
 #endif
 
 /* In gtktextbtree.c */
-VARIABLE GtkTextLineSegmentClass gtk_text_char_type;
-VARIABLE GtkTextLineSegmentClass gtk_text_toggle_on_type;
-VARIABLE GtkTextLineSegmentClass gtk_text_toggle_off_type;
+extern GtkTextLineSegmentClass gtk_text_char_type;
+extern GtkTextLineSegmentClass gtk_text_toggle_on_type;
+extern GtkTextLineSegmentClass gtk_text_toggle_off_type;
 
 /* In gtktextmark.c */
-VARIABLE GtkTextLineSegmentClass gtk_text_left_mark_type;
-VARIABLE GtkTextLineSegmentClass gtk_text_right_mark_type;
+extern GtkTextLineSegmentClass gtk_text_left_mark_type;
+extern GtkTextLineSegmentClass gtk_text_right_mark_type;
 
 /* In gtktextchild.c */
-VARIABLE GtkTextLineSegmentClass gtk_text_pixbuf_type;
-VARIABLE GtkTextLineSegmentClass gtk_text_child_type;
+extern GtkTextLineSegmentClass gtk_text_pixbuf_type;
+extern GtkTextLineSegmentClass gtk_text_child_type;
 
 /*
  * UTF 8 Stubs
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 46bee56780..489a04e037 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1885,7 +1885,7 @@ gtk_text_view_child_allocated (GtkTextLayout *layout,
 
   g_assert (vc != NULL);
 
-  printf ("child allocated at %d,%d\n", x, y);
+  g_print ("child allocated at %d,%d\n", x, y);
   
   vc->from_left_of_buffer = x;
   vc->from_top_of_line = y;
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 0013fd77cf..76f5707c15 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -27,7 +27,7 @@ INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
 DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS)
 LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
 # Some files use near as an identifier
-DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear
+DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"@GTK_VERSION@\"
 
 TOUCH = copy makefile.msc+nul
 
@@ -465,5 +465,6 @@ simple.obj : simple.c
 makefile.msc: makefile.msc.in
 	sed -e s,@GTK[_]MAJOR_VERSION@,@GTK_MAJOR_VERSION@, \
 	    -e s,@GTK[_]MINOR_VERSION@,@GTK_MINOR_VERSION@, \
+	    -e 's,@GTK[_]VERSION@,@GTK_VERSION@,' \
 	    -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
 	    -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,'  <makefile.msc.in >$@