diff options
author | Owen Taylor <otaylor@redhat.com> | 1998-12-16 20:09:30 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 1998-12-16 20:09:30 +0000 |
commit | fcfe7370d8a9ac7b169282418e4f2bc58e6d9eb4 (patch) | |
tree | b1629251195a04377d72cbb49a90af3db3c18afb /gtk/gtkcolorsel.c | |
parent | 0dcdac5828bfb039f0a35be2d21fd6b3b8750d4c (diff) | |
download | gdk-pixbuf-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/gtkcolorsel.c')
-rw-r--r-- | gtk/gtkcolorsel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 23a621a27..eb660b9d4 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -24,7 +24,6 @@ #include "gtkwindow.h" #include "gtkhbbox.h" #include "gtkdnd.h" -#include "gtkprivate.h" #include "gtkselection.h" /* @@ -1028,13 +1027,13 @@ gtk_color_selection_value_timeout (GtkColorSelection *colorsel) { gint x, y; - GTK_THREADS_ENTER (); + GDK_THREADS_ENTER (); gdk_window_get_pointer (colorsel->value_area->window, &x, &y, NULL); gtk_color_selection_update_value (colorsel, y); gtk_color_selection_color_changed (colorsel); - GTK_THREADS_LEAVE (); + GDK_THREADS_LEAVE (); return (TRUE); } |