don't reduce the scroll rect size by the scroll amount

2002-02-10  Hans Breuer  <hans@breuer.org>

	* gdk/win32/gdkgeometry-win32.c : don't reduce the scroll
	rect size by the scroll amount

	* gdk/win32/gdkwindow-win32.c
	* gdk/win32/gdkselection-win32.c : added some casts to
	make it compile with msvc's strict type checking

	* gtk/fnmatch.c : #include <ctype.h> again for tolower
	prototype. The fnmatch() code assumes to be in the crt
	locale though it is feeded by utf8 strings from gtkfilesel.c

	* gtk/gtkfilesel.c : let ->cmpl_text be a strdup managed by
	_CompletionDir instead of referencing already freed memory

	* gtk/gtktooltips.c (gtk_tooltips_init) : fix typo to
	gtk_rc_parse_string (theDefaultTooltipColor) once as it
	was intended

	* tests/makefile.msc : added more tests

	* tests/testgtk.c (create_list) : don't try to load gtkenums.h
	from the current directory use ../gtk/gtkenums.h instead

15 files changed, 190 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 10a5c3b190..9e55008909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2002-02-10  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkgeometry-win32.c : don't reduce the scroll
+	rect size by the scroll amount
+
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkselection-win32.c : added some casts to
+	make it compile with msvc's strict type checking
+
+	* gtk/fnmatch.c : #include <ctype.h> again for tolower
+	prototype. The fnmatch() code assumes to be in the crt 
+	locale though it is feeded by utf8 strings from gtkfilesel.c
+
+	* gtk/gtkfilesel.c : let ->cmpl_text be a strdup managed by
+	_CompletionDir instead of referencing already freed memory
+
+	* gtk/gtktooltips.c (gtk_tooltips_init) : fix typo to
+	gtk_rc_parse_string (theDefaultTooltipColor) once as it
+	was intended
+
+	* tests/makefile.msc : added more tests
+
+	* tests/testgtk.c (create_list) : don't try to load gtkenums.h
+	from the current directory use ../gtk/gtkenums.h instead
+
 2002-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gtk/gtksizegroup.c: Fix a double «The» typo in a string.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 10a5c3b190..9e55008909 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,28 @@
+2002-02-10  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkgeometry-win32.c : don't reduce the scroll
+	rect size by the scroll amount
+
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkselection-win32.c : added some casts to
+	make it compile with msvc's strict type checking
+
+	* gtk/fnmatch.c : #include <ctype.h> again for tolower
+	prototype. The fnmatch() code assumes to be in the crt 
+	locale though it is feeded by utf8 strings from gtkfilesel.c
+
+	* gtk/gtkfilesel.c : let ->cmpl_text be a strdup managed by
+	_CompletionDir instead of referencing already freed memory
+
+	* gtk/gtktooltips.c (gtk_tooltips_init) : fix typo to
+	gtk_rc_parse_string (theDefaultTooltipColor) once as it
+	was intended
+
+	* tests/makefile.msc : added more tests
+
+	* tests/testgtk.c (create_list) : don't try to load gtkenums.h
+	from the current directory use ../gtk/gtkenums.h instead
+
 2002-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gtk/gtksizegroup.c: Fix a double «The» typo in a string.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 10a5c3b190..9e55008909 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,28 @@
+2002-02-10  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkgeometry-win32.c : don't reduce the scroll
+	rect size by the scroll amount
+
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkselection-win32.c : added some casts to
+	make it compile with msvc's strict type checking
+
+	* gtk/fnmatch.c : #include <ctype.h> again for tolower
+	prototype. The fnmatch() code assumes to be in the crt 
+	locale though it is feeded by utf8 strings from gtkfilesel.c
+
+	* gtk/gtkfilesel.c : let ->cmpl_text be a strdup managed by
+	_CompletionDir instead of referencing already freed memory
+
+	* gtk/gtktooltips.c (gtk_tooltips_init) : fix typo to
+	gtk_rc_parse_string (theDefaultTooltipColor) once as it
+	was intended
+
+	* tests/makefile.msc : added more tests
+
+	* tests/testgtk.c (create_list) : don't try to load gtkenums.h
+	from the current directory use ../gtk/gtkenums.h instead
+
 2002-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gtk/gtksizegroup.c: Fix a double «The» typo in a string.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 10a5c3b190..9e55008909 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,28 @@
+2002-02-10  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkgeometry-win32.c : don't reduce the scroll
+	rect size by the scroll amount
+
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkselection-win32.c : added some casts to
+	make it compile with msvc's strict type checking
+
+	* gtk/fnmatch.c : #include <ctype.h> again for tolower
+	prototype. The fnmatch() code assumes to be in the crt 
+	locale though it is feeded by utf8 strings from gtkfilesel.c
+
+	* gtk/gtkfilesel.c : let ->cmpl_text be a strdup managed by
+	_CompletionDir instead of referencing already freed memory
+
+	* gtk/gtktooltips.c (gtk_tooltips_init) : fix typo to
+	gtk_rc_parse_string (theDefaultTooltipColor) once as it
+	was intended
+
+	* tests/makefile.msc : added more tests
+
+	* tests/testgtk.c (create_list) : don't try to load gtkenums.h
+	from the current directory use ../gtk/gtkenums.h instead
+
 2002-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gtk/gtksizegroup.c: Fix a double «The» typo in a string.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 10a5c3b190..9e55008909 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,28 @@
+2002-02-10  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkgeometry-win32.c : don't reduce the scroll
+	rect size by the scroll amount
+
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkselection-win32.c : added some casts to
+	make it compile with msvc's strict type checking
+
+	* gtk/fnmatch.c : #include <ctype.h> again for tolower
+	prototype. The fnmatch() code assumes to be in the crt 
+	locale though it is feeded by utf8 strings from gtkfilesel.c
+
+	* gtk/gtkfilesel.c : let ->cmpl_text be a strdup managed by
+	_CompletionDir instead of referencing already freed memory
+
+	* gtk/gtktooltips.c (gtk_tooltips_init) : fix typo to
+	gtk_rc_parse_string (theDefaultTooltipColor) once as it
+	was intended
+
+	* tests/makefile.msc : added more tests
+
+	* tests/testgtk.c (create_list) : don't try to load gtkenums.h
+	from the current directory use ../gtk/gtkenums.h instead
+
 2002-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gtk/gtksizegroup.c: Fix a double «The» typo in a string.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 10a5c3b190..9e55008909 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,28 @@
+2002-02-10  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkgeometry-win32.c : don't reduce the scroll
+	rect size by the scroll amount
+
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkselection-win32.c : added some casts to
+	make it compile with msvc's strict type checking
+
+	* gtk/fnmatch.c : #include <ctype.h> again for tolower
+	prototype. The fnmatch() code assumes to be in the crt 
+	locale though it is feeded by utf8 strings from gtkfilesel.c
+
+	* gtk/gtkfilesel.c : let ->cmpl_text be a strdup managed by
+	_CompletionDir instead of referencing already freed memory
+
+	* gtk/gtktooltips.c (gtk_tooltips_init) : fix typo to
+	gtk_rc_parse_string (theDefaultTooltipColor) once as it
+	was intended
+
+	* tests/makefile.msc : added more tests
+
+	* tests/testgtk.c (create_list) : don't try to load gtkenums.h
+	from the current directory use ../gtk/gtkenums.h instead
+
 2002-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gtk/gtksizegroup.c: Fix a double «The» typo in a string.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 10a5c3b190..9e55008909 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,28 @@
+2002-02-10  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkgeometry-win32.c : don't reduce the scroll
+	rect size by the scroll amount
+
+	* gdk/win32/gdkwindow-win32.c
+	* gdk/win32/gdkselection-win32.c : added some casts to
+	make it compile with msvc's strict type checking
+
+	* gtk/fnmatch.c : #include <ctype.h> again for tolower
+	prototype. The fnmatch() code assumes to be in the crt 
+	locale though it is feeded by utf8 strings from gtkfilesel.c
+
+	* gtk/gtkfilesel.c : let ->cmpl_text be a strdup managed by
+	_CompletionDir instead of referencing already freed memory
+
+	* gtk/gtktooltips.c (gtk_tooltips_init) : fix typo to
+	gtk_rc_parse_string (theDefaultTooltipColor) once as it
+	was intended
+
+	* tests/makefile.msc : added more tests
+
+	* tests/testgtk.c (create_list) : don't try to load gtkenums.h
+	from the current directory use ../gtk/gtkenums.h instead
+
 2002-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gtk/gtksizegroup.c: Fix a double «The» typo in a string.
diff --git a/gdk/win32/gdkgeometry-win32.c b/gdk/win32/gdkgeometry-win32.c
index 1ed7b343ec..25ce720a6a 100644
--- a/gdk/win32/gdkgeometry-win32.c
+++ b/gdk/win32/gdkgeometry-win32.c
@@ -127,8 +127,8 @@ gdk_window_copy_area_scroll (GdkWindow    *window,
   if (dest_rect->width > 0 && dest_rect->height > 0)
     {
       RECT clipRect;
-      clipRect.left   = dest_rect->x - dx;
-      clipRect.top    = dest_rect->y - dy;
+      clipRect.left   = dest_rect->x;
+      clipRect.top    = dest_rect->y;
       clipRect.right  = clipRect.left + dest_rect->width;
       clipRect.bottom = clipRect.top + dest_rect->height;
 
@@ -137,7 +137,7 @@ gdk_window_copy_area_scroll (GdkWindow    *window,
       if (!ScrollWindowEx (GDK_WINDOW_HWND (window),
                            dx, dy, /* in: scroll offsets */
                            NULL, /* in: scroll rect, NULL == entire client area */
-                           &clipRect, /* in: restrict to, XXX: really want this ?? */
+                           &clipRect, /* in: restrict to */
                            NULL, /* out: update region */
                            NULL, /* out: update rect */
                            SW_INVALIDATE))
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index c8e6174c8b..4a80fef234 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -203,7 +203,7 @@ gdk_selection_owner_get (GdkAtom selection)
   if (selection == GDK_SELECTION_CLIPBOARD)
     return NULL;
 
-  window = gdk_window_lookup (g_hash_table_lookup (sel_owner_table, selection));
+  window = gdk_window_lookup ((GdkNativeWindow) g_hash_table_lookup (sel_owner_table, selection));
 
   GDK_NOTE (DND,
 	    (sel_name = gdk_atom_name (selection),
@@ -279,7 +279,7 @@ gdk_selection_convert (GdkWindow *requestor,
 	  GdkAtom *data = g_new (GdkAtom, 1);
 	  *data = GDK_TARGET_STRING;
 	  _gdk_selection_property_store (requestor, GDK_SELECTION_TYPE_ATOM,
-					 32, data, 1 * sizeof (GdkAtom));
+					 32, (guchar *) data, 1 * sizeof (GdkAtom));
 	}
       else
 	property = GDK_NONE;
@@ -566,7 +566,7 @@ gdk_text_property_to_text_list (GdkAtom       encoding,
   if (!list)
     return 0;
 
-  *list = g_new (gchar **, 1);
+  *list = g_new (gchar *, 1);
   **list = g_strdup (text);
   
   return 1;
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 4ec814c703..4a331243ce 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -1881,7 +1881,7 @@ _gdk_windowing_window_get_pointer (GdkWindow       *window,
 	    hwnd = hwndc;
 	}
       
-      return_val = gdk_window_lookup (hwnd);
+      return_val = gdk_window_lookup ((GdkNativeWindow) hwnd);
     }
   else
     return_val = NULL;
diff --git a/gtk/fnmatch.c b/gtk/fnmatch.c
index 06576cb561..198363fc84 100644
--- a/gtk/fnmatch.c
+++ b/gtk/fnmatch.c
@@ -28,6 +28,7 @@
 #endif
 
 #include <errno.h>
+#include <ctype.h> /* tolower */
 
 /* Added for GTK. We need to make sure that all constants are defined
  * to properly compile this file */
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index a3fc58149d..a61ab2212d 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -2308,6 +2308,7 @@ cmpl_free_state (CompletionState* cmpl_state)
 static void
 free_dir (CompletionDir* dir)
 {
+  g_free (dir->cmpl_text);
   g_free (dir->fullname);
   g_free (dir);
 }
@@ -2407,7 +2408,7 @@ cmpl_completion_matches (gchar           *text_to_complete,
 
   cmpl_state->completion_dir->cmpl_index = -1;
   cmpl_state->completion_dir->cmpl_parent = NULL;
-  cmpl_state->completion_dir->cmpl_text = *remaining_text;
+  cmpl_state->completion_dir->cmpl_text = g_strdup (*remaining_text);
 
   cmpl_state->active_completion_dir = cmpl_state->completion_dir;
 
@@ -2856,6 +2857,7 @@ attach_dir (CompletionDirSent *sent,
   new_dir->sent = sent;
   new_dir->fullname = g_strdup (dir_name);
   new_dir->fullname_len = strlen (dir_name);
+  new_dir->cmpl_text = NULL;
 
   return new_dir;
 }
@@ -3399,7 +3401,7 @@ attempt_file_completion (CompletionState *cmpl_state)
 	      new_dir->cmpl_parent = dir;
 
 	      new_dir->cmpl_index = -1;
-	      new_dir->cmpl_text = first_slash + 1;
+	      new_dir->cmpl_text = g_strdup (first_slash + 1);
 
 	      cmpl_state->active_completion_dir = new_dir;
 
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index 125a607327..ec4c21d808 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -105,7 +105,7 @@ static void
 gtk_tooltips_init (GtkTooltips *tooltips)
 {
   static gboolean have_rc = FALSE;
-  if (have_rc)
+  if (!have_rc)
     {
       have_rc = TRUE;
       
diff --git a/tests/makefile.msc b/tests/makefile.msc
index 10bcef81c0..c83ff39f3d 100644
--- a/tests/makefile.msc
+++ b/tests/makefile.msc
@@ -41,6 +41,7 @@ all :	\
 #
 TESTAPPS = testcalendar testdnd testgtk testinput testrgb testselection \
 		testtext testtextbuffer testsocket testsocket_child \
+		testtreeedit testtreeflow \
 		testtreecolumns testtreefocus testtreesort testtreeview treestoretest \
 		testthreads simple
 
diff --git a/tests/testgtk.c b/tests/testgtk.c
index f2b23a81e9..c0f1da52c4 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -4774,7 +4774,7 @@ create_list (void)
 	 gtk_scrolled_window_get_hadjustment
 	 (GTK_SCROLLED_WINDOW (scrolled_win)));
 
-      if ((infile = fopen("gtkenums.h", "r")))
+      if ((infile = fopen("../gtk/gtkenums.h", "r")))
 	{
 	  char buffer[256];
 	  char *pos;