Move main thread lock back to GDK - we need it there for locking when

Wed Dec 16 13:06:17 1998  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdk.[ch] gtk/gtkmain.[ch] gtk/gtkprivate.h: Move main
	thread lock back to GDK - we need it there for locking
	when translating events. Rename things appropriately.

Wed Dec 16 11:44:21 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkrange.c (gtk_range_expose): Fix a x/y typo.

CVS:
This commit is contained in:
Owen Taylor
1998-12-16 20:09:30 +00:00
committed by Owen Taylor
parent 0dcdac5828
commit fcfe7370d8
38 changed files with 237 additions and 118 deletions

View File

@ -1891,20 +1891,36 @@ gdk_event_prepare (gpointer source_data,
GTimeVal *current_time,
gint *timeout)
{
gboolean retval;
GDK_THREADS_ENTER ();
*timeout = -1;
gdk_events_queue ();
return (queued_events || putback_events);
retval = (queued_events || putback_events);
GDK_THREADS_LEAVE ();
return retval;
}
static gboolean
gdk_event_check (gpointer source_data,
GTimeVal *current_time)
{
gboolean retval;
GDK_THREADS_ENTER ();
if (event_poll_fd.revents & G_IO_IN)
gdk_events_queue ();
return (queued_events || putback_events);
retval = (queued_events || putback_events);
GDK_THREADS_LEAVE ();
return retval;
}
static GdkEvent *
@ -1942,7 +1958,11 @@ gdk_event_dispatch (gpointer source_data,
GTimeVal *current_time,
gpointer user_data)
{
GdkEvent *event = gdk_event_unqueue();
GdkEvent *event;
GDK_THREADS_ENTER ();
event = gdk_event_unqueue();
if (event)
{
@ -1952,6 +1972,8 @@ gdk_event_dispatch (gpointer source_data,
gdk_event_free (event);
}
GDK_THREADS_LEAVE ();
return TRUE;
}