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.

9 files changed, 33 insertions, 30 deletions

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 >$@