Commented out testthreads from the build process, since we won't have any

Tue Dec 15 01:38:53 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/Makefile.am: Commented out testthreads from
	the build process, since we won't have any idea
	how to create a thread.

	* configure.in (LIBS): use glib-config ... gthread
	so we always build a thread-compatible library.

        * gtk/gtkaccellabel.c gtk/gtkclist.c gtk/gtkcolorsel.c
	  gtk/gtkcombo.c gtk/gtkcontainer.c gtk/gtkentry.c
	  gtk/gtklist.c gtk/gtkmenuitem.c gtk/gtknotebook.c
	  gtk/gtkrange.c gtk/gtkselection.c gtk/gtkspinbutton.c
	  gtk/gtktext.c gtk/gtktooltips.c gtk/gtkwidget.c:

	Add GTK_THREADS_ENTER/LEAVE pairs around timeouts
	and idles to account for the fact that they are no
	longer called within the GTK+ lock.

	* gtk/gtkprivate.h: Added definitions for locking
	the main GTK+ mutex.

	* gtk/gtkmain.c: Re-implement the main loop
	in terms of the GLib main loop.

	* gdk/gdk.h gdk/gdkthreads.c gdk/Makefile.am: Removed threading
	functionality, as it seems better to subsume GDK within the
	GTK+ lock than vice-versa.

        * gdk/gdkevents.c: New file, containing event handling bits
	from gdk.c.

	* gdk/gdkevents.c: Implement event source for GDK
	events.

	* configure.in gdk/gdkevents.c: Removed attempts to
	subtract base_id, which were already non-functional.

1 files changed, 14 insertions, 12 deletions

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 0a993a2fd2..79a208a426 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -21,6 +21,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gdk/gdki18n.h"
 #include "gtkmain.h"
+#include "gtkprivate.h"
 #include "gtkselection.h"
 #include "gtksignal.h"
 #include "gtktext.h"
@@ -1697,26 +1698,27 @@ gtk_text_scroll_timeout (gpointer data)
 {
   GtkText *text;
   GdkEventMotion event;
-  
   gint x, y;
   GdkModifierType mask;
   
-  g_return_val_if_fail (GTK_IS_TEXT (data), FALSE);
-  
+  GTK_THREADS_ENTER;
+
   text = GTK_TEXT (data);
   
   text->timer = 0;
   gdk_window_get_pointer (text->text_area, &x, &y, &mask);
   
-  if (!(mask & (GDK_BUTTON1_MASK | GDK_BUTTON3_MASK)))
-    return FALSE;
-  
-  event.is_hint = 0;
-  event.x = x;
-  event.y = y;
-  event.state = mask;
-  
-  gtk_text_motion_notify (GTK_WIDGET (text), &event);
+  if (mask & (GDK_BUTTON1_MASK | GDK_BUTTON3_MASK))
+    {
+      event.is_hint = 0;
+      event.x = x;
+      event.y = y;
+      event.state = mask;
+      
+      gtk_text_motion_notify (GTK_WIDGET (text), &event);
+    }
+
+  GTK_THREADS_LEAVE;
   
   return FALSE;
 }