Fix link to PNG home, remove reference to fribidi.

Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>

	* INSTALL: Fix link to PNG home, remove reference
	to fribidi.

	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.

	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
	tested.)

	* gtk/gtkcheckmenuitem.c: Permanently turn on
	always_show_toggle.

	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
	be NULL. (Vladimir Klebanov, #26545)

	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
	some signed/unsigned comparison problems. (#6510,
	David Kaelbling)

	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
	return type to boolean (Oskar Liljeblad, #18648)

15 files changed, 219 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 26d16ac05..19645d22b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL: Fix link to PNG home, remove reference
+	to fribidi.
+
+	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
+	
+	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
+	tested.)
+
+	* gtk/gtkcheckmenuitem.c: Permanently turn on
+	always_show_toggle.
+
+	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to 
+	be NULL. (Vladimir Klebanov, #26545)
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix 
+	some signed/unsigned comparison problems. (#6510,
+	David Kaelbling)
+
+	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
+	return type to boolean (Oskar Liljeblad, #18648)
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 26d16ac05..19645d22b 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,26 @@
+Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL: Fix link to PNG home, remove reference
+	to fribidi.
+
+	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
+	
+	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
+	tested.)
+
+	* gtk/gtkcheckmenuitem.c: Permanently turn on
+	always_show_toggle.
+
+	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to 
+	be NULL. (Vladimir Klebanov, #26545)
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix 
+	some signed/unsigned comparison problems. (#6510,
+	David Kaelbling)
+
+	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
+	return type to boolean (Oskar Liljeblad, #18648)
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 26d16ac05..19645d22b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,26 @@
+Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL: Fix link to PNG home, remove reference
+	to fribidi.
+
+	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
+	
+	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
+	tested.)
+
+	* gtk/gtkcheckmenuitem.c: Permanently turn on
+	always_show_toggle.
+
+	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to 
+	be NULL. (Vladimir Klebanov, #26545)
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix 
+	some signed/unsigned comparison problems. (#6510,
+	David Kaelbling)
+
+	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
+	return type to boolean (Oskar Liljeblad, #18648)
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 26d16ac05..19645d22b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,26 @@
+Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL: Fix link to PNG home, remove reference
+	to fribidi.
+
+	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
+	
+	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
+	tested.)
+
+	* gtk/gtkcheckmenuitem.c: Permanently turn on
+	always_show_toggle.
+
+	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to 
+	be NULL. (Vladimir Klebanov, #26545)
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix 
+	some signed/unsigned comparison problems. (#6510,
+	David Kaelbling)
+
+	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
+	return type to boolean (Oskar Liljeblad, #18648)
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 26d16ac05..19645d22b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,26 @@
+Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL: Fix link to PNG home, remove reference
+	to fribidi.
+
+	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
+	
+	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
+	tested.)
+
+	* gtk/gtkcheckmenuitem.c: Permanently turn on
+	always_show_toggle.
+
+	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to 
+	be NULL. (Vladimir Klebanov, #26545)
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix 
+	some signed/unsigned comparison problems. (#6510,
+	David Kaelbling)
+
+	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
+	return type to boolean (Oskar Liljeblad, #18648)
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 26d16ac05..19645d22b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,26 @@
+Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL: Fix link to PNG home, remove reference
+	to fribidi.
+
+	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
+	
+	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
+	tested.)
+
+	* gtk/gtkcheckmenuitem.c: Permanently turn on
+	always_show_toggle.
+
+	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to 
+	be NULL. (Vladimir Klebanov, #26545)
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix 
+	some signed/unsigned comparison problems. (#6510,
+	David Kaelbling)
+
+	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
+	return type to boolean (Oskar Liljeblad, #18648)
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 26d16ac05..19645d22b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,26 @@
+Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* INSTALL: Fix link to PNG home, remove reference
+	to fribidi.
+
+	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
+	
+	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
+	tested.)
+
+	* gtk/gtkcheckmenuitem.c: Permanently turn on
+	always_show_toggle.
+
+	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to 
+	be NULL. (Vladimir Klebanov, #26545)
+
+	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix 
+	some signed/unsigned comparison problems. (#6510,
+	David Kaelbling)
+
+	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
+	return type to boolean (Oskar Liljeblad, #18648)
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
diff --git a/INSTALL b/INSTALL
index b0cc09eae..de23ce7a7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,16 +9,12 @@ GTK+ requires the following packages:
 
       http://www.pango.org/download.shtml
 
-   Pango also requires the FriBidi library, available from:
-
-      http://imagic.weizmann.ac.il/~dov/freesw/FriBidi/
-
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not
    these libraries are available from:
 
     http://www.libtiff.org/
-    ftp://swrinde.nde.swri.edu/pub/png/src/
+    http://www.libpng.org/
     ftp://ftp.uu.net/graphics/jpeg/
 
    If these libraries are not available, the corresponding 
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index a4d66c33d..bbebeed36 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -94,16 +94,13 @@ static gboolean  gdk_event_translate	(GdkEvent *event,
 					 MSG      *msg,
 					 gboolean *ret_val_flagp,
 					 gint     *ret_valp);
-static gboolean  gdk_event_prepare      (gpointer  source_data, 
-				 	 GTimeVal *current_time,
-					 gint     *timeout,
-					 gpointer  user_data);
-static gboolean  gdk_event_check        (gpointer  source_data,
-				 	 GTimeVal *current_time,
-					 gpointer  user_data);
-static gboolean  gdk_event_dispatch     (gpointer  source_data,
-					 GTimeVal *current_time,
-					 gpointer  user_data);
+
+static gboolean gdk_event_prepare  (GSource     *source,
+				    gint        *timeout);
+static gboolean gdk_event_check    (GSource     *source);
+static gboolean gdk_event_dispatch (GSource     *source,
+				    GSourceFunc  callback,
+				    gpointer     user_data);
 
 /* Private variable declarations
  */
@@ -290,6 +287,7 @@ gdk_window_procedure (HWND   hwnd,
 void 
 gdk_events_init (void)
 {
+  GSource *source;
   HRESULT hres;
 #ifdef USE_TRACKMOUSEEVENT
   HMODULE user32, imm32;
@@ -307,12 +305,17 @@ gdk_events_init (void)
   msh_mousewheel_msg = RegisterWindowMessage ("MSWHEEL_ROLLMSG");
   GDK_NOTE (EVENTS, g_print ("MSH_MOUSEWHEEL = %#x\n", msh_mousewheel_msg));
 
-  g_source_add (GDK_PRIORITY_EVENTS, TRUE, &event_funcs, NULL, NULL, NULL);
+  source = g_source_new (&event_funcs, sizeof (GSource));
+  g_source_set_priority (source, GDK_PRIORITY_EVENTS);
 
   event_poll_fd.fd = G_WIN32_MSG_HANDLE;
   event_poll_fd.events = G_IO_IN;
   
-  g_main_add_poll (&event_poll_fd, GDK_PRIORITY_EVENTS);
+  g_source_add_poll (source, &event_poll_fd);
+  g_source_set_can_recurse (source, TRUE);
+  g_source_attach (source, NULL);
+
+  g_source_add (GDK_PRIORITY_EVENTS, TRUE, &event_funcs, NULL, NULL, NULL);
 
   hres = CoCreateInstance (&CLSID_CActiveIMM,
 			   NULL,
@@ -2836,11 +2839,9 @@ gdk_events_queue (void)
     }
 }
 
-static gboolean  
-gdk_event_prepare (gpointer  source_data, 
-		   GTimeVal *current_time,
-		   gint     *timeout,
-		   gpointer  user_data)
+static gboolean
+gdk_event_prepare (GSource *source,
+		   gint    *timeout)
 {
   MSG msg;
   gboolean retval;
@@ -2857,10 +2858,8 @@ gdk_event_prepare (gpointer  source_data,
   return retval;
 }
 
-static gboolean  
-gdk_event_check (gpointer  source_data,
-		 GTimeVal *current_time,
-		 gpointer  user_data)
+static gboolean
+gdk_event_check (GSource *source)
 {
   MSG msg;
   gboolean retval;
@@ -2878,10 +2877,10 @@ gdk_event_check (gpointer  source_data,
   return retval;
 }
 
-static gboolean  
-gdk_event_dispatch (gpointer  source_data,
-		    GTimeVal *current_time,
-		    gpointer  user_data)
+static gboolean
+gdk_event_dispatch (GSource     *source,
+		    GSourceFunc  callback,
+		    gpointer     user_data)
 {
   GdkEvent *event;
  
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 59de87bc9..afd843ded 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -86,16 +86,12 @@ static Bool	 gdk_event_get_type	(Display   *display,
 					 XPointer   arg);
 #endif
 
-static gboolean  gdk_event_prepare      (gpointer   source_data, 
-				 	 GTimeVal  *current_time,
-					 gint      *timeout,
-					 gpointer   user_data);
-static gboolean  gdk_event_check        (gpointer   source_data,
-				 	 GTimeVal  *current_time,
-					 gpointer   user_data);
-static gboolean  gdk_event_dispatch     (gpointer   source_data,
-					 GTimeVal  *current_time,
-					 gpointer   user_data);
+static gboolean gdk_event_prepare  (GSource     *source,
+				    gint        *timeout);
+static gboolean gdk_event_check    (GSource     *source);
+static gboolean gdk_event_dispatch (GSource     *source,
+				    GSourceFunc  callback,
+				    gpointer     user_data);
 
 GdkFilterReturn gdk_wm_protocols_filter (GdkXEvent *xev,
 					 GdkEvent  *event,
@@ -116,7 +112,7 @@ static GSourceFuncs event_funcs = {
   gdk_event_prepare,
   gdk_event_check,
   gdk_event_dispatch,
-  (GDestroyNotify)g_free
+  NULL
 };
 
 GPollFD event_poll_fd;
@@ -128,16 +124,22 @@ GPollFD event_poll_fd;
 void 
 gdk_events_init (void)
 {
+  GSource *source;
+  
   connection_number = ConnectionNumber (gdk_display);
   GDK_NOTE (MISC,
 	    g_message ("connection number: %d", connection_number));
 
-  g_source_add (GDK_PRIORITY_EVENTS, TRUE, &event_funcs, NULL, NULL, NULL);
 
+  source = g_source_new (&event_funcs, sizeof (GSource));
+  g_source_set_priority (source, GDK_PRIORITY_EVENTS);
+  
   event_poll_fd.fd = connection_number;
   event_poll_fd.events = G_IO_IN;
   
-  g_main_add_poll (&event_poll_fd, GDK_PRIORITY_EVENTS);
+  g_source_add_poll (source, &event_poll_fd);
+  g_source_set_can_recurse (source, TRUE);
+  g_source_attach (source, NULL);
 
   gdk_add_client_message_filter (gdk_wm_protocols, 
 				 gdk_wm_protocols_filter, NULL);
@@ -1281,7 +1283,7 @@ gdk_events_queue (void)
  	    w = GDK_WINDOW_XWINDOW (gdk_xim_window);
  	    break;
  	  }
-      
+
       if (XFilterEvent (&xevent, w))
 	continue;
 #else
@@ -1313,10 +1315,8 @@ gdk_events_queue (void)
 }
 
 static gboolean  
-gdk_event_prepare (gpointer  source_data, 
-		   GTimeVal *current_time,
-		   gint     *timeout,
-		   gpointer  user_data)
+gdk_event_prepare (GSource  *source,
+		   gint     *timeout)
 {
   gboolean retval;
   
@@ -1332,9 +1332,7 @@ gdk_event_prepare (gpointer  source_data,
 }
 
 static gboolean  
-gdk_event_check (gpointer  source_data,
-		 GTimeVal *current_time,
-		 gpointer  user_data)
+gdk_event_check (GSource  *source) 
 {
   gboolean retval;
   
@@ -1351,9 +1349,9 @@ gdk_event_check (gpointer  source_data,
 }
 
 static gboolean  
-gdk_event_dispatch (gpointer  source_data,
-		    GTimeVal *current_time,
-		    gpointer  user_data)
+gdk_event_dispatch (GSource    *source,
+		    GSourceFunc callback,
+		    gpointer    user_data)
 {
   GdkEvent *event;
  
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 5c4560fde..728b63443 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -162,8 +162,10 @@ gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
 {
   g_return_if_fail (menu_item != NULL);
   g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
-  
+
+#if 0
   menu_item->always_show_toggle = always != FALSE;
+#endif  
 }
 
 void
@@ -176,7 +178,7 @@ static void
 gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item)
 {
   check_menu_item->active = FALSE;
-  check_menu_item->always_show_toggle = FALSE;
+  check_menu_item->always_show_toggle = TRUE;
 }
 
 static gint
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 8af4a01eb..8d83c47f1 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -2364,7 +2364,8 @@ gtk_clist_get_pixtext (GtkCList   *clist,
     *pixmap = GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap;
 
   /* mask can be NULL */
-  *mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask;
+  if (mask)
+    *mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask;
 
   return 1;
 }
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index ce9a5356f..2c5d6abf0 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1209,7 +1209,7 @@ gtk_spin_button_insert_text (GtkEntry    *entry,
       gint i;
       GdkWChar pos_sign;
       GdkWChar neg_sign;
-      guint entry_length;
+      gint entry_length;
 
       entry_length = entry->text_length;
 
@@ -1244,7 +1244,7 @@ gtk_spin_button_insert_text (GtkEntry    *entry,
 	  }
 
       if (dotpos > -1 && *position > dotpos &&
-	  spin->digits - entry_length
+	  (gint)spin->digits - entry_length
 	    + dotpos - new_text_length + 1 < 0)
 	return;
 
@@ -1260,7 +1260,7 @@ gtk_spin_button_insert_text (GtkEntry    *entry,
 	    {
 	      if (!spin->digits || dotpos > -1 || 
  		  (new_text_length - 1 - i + entry_length
-		    - *position > spin->digits)) 
+		    - *position > (gint)spin->digits)) 
 		return;
 	      dotpos = *position + i;
 	    }
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index f873fc7eb..3f7b4c9de 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4294,7 +4294,7 @@ gtk_widget_get_pointer (GtkWidget *widget,
  *   results:
  *****************************************/
 
-gint
+gboolean
 gtk_widget_is_ancestor (GtkWidget *widget,
 			GtkWidget *ancestor)
 {
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index fb76563f6..0d86f3fe7 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -546,7 +546,7 @@ void	     gtk_widget_get_pointer	(GtkWidget	*widget,
 					 gint		*x,
 					 gint		*y);
 
-gint	     gtk_widget_is_ancestor	(GtkWidget	*widget,
+gboolean     gtk_widget_is_ancestor	(GtkWidget	*widget,
 					 GtkWidget	*ancestor);
 
 /* Hide widget and return TRUE.