summaryrefslogtreecommitdiff
path: root/gtk/gtklist.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1998-12-16 20:09:30 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-12-16 20:09:30 +0000
commitfcfe7370d8a9ac7b169282418e4f2bc58e6d9eb4 (patch)
treeb1629251195a04377d72cbb49a90af3db3c18afb /gtk/gtklist.c
parent0dcdac5828bfb039f0a35be2d21fd6b3b8750d4c (diff)
downloadgtk+-fcfe7370d8a9ac7b169282418e4f2bc58e6d9eb4.tar.gz
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:
Diffstat (limited to 'gtk/gtklist.c')
-rw-r--r--gtk/gtklist.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 32856d73a0..d0049ec7e6 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -19,7 +19,6 @@
#include "gtklist.h"
#include "gtklistitem.h"
#include "gtkmain.h"
-#include "gtkprivate.h"
#include "gtksignal.h"
#include "gtklabel.h"
@@ -2309,7 +2308,7 @@ gtk_list_horizontal_timeout (GtkWidget *list)
GdkEventMotion event;
GdkModifierType mask;
- GTK_THREADS_ENTER ();
+ GDK_THREADS_ENTER ();
GTK_LIST (list)->htimer = 0;
gdk_window_get_pointer (list->window, &x, &y, &mask);
@@ -2321,7 +2320,7 @@ gtk_list_horizontal_timeout (GtkWidget *list)
gtk_list_motion_notify (list, &event);
- GTK_THREADS_LEAVE ();
+ GDK_THREADS_LEAVE ();
return FALSE;
}
@@ -2334,7 +2333,7 @@ gtk_list_vertical_timeout (GtkWidget *list)
GdkEventMotion event;
GdkModifierType mask;
- GTK_THREADS_ENTER ();
+ GDK_THREADS_ENTER ();
GTK_LIST (list)->vtimer = 0;
gdk_window_get_pointer (list->window, &x, &y, &mask);
@@ -2346,7 +2345,7 @@ gtk_list_vertical_timeout (GtkWidget *list)
gtk_list_motion_notify (list, &event);
- GTK_THREADS_LEAVE ();
+ GDK_THREADS_LEAVE ();
return FALSE;
}