callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/testthreads.c
View File

@ -53,7 +53,7 @@ counter (void *data)
GtkWidget *label;
GtkWidget *button;
gtk_threads_enter();
gdk_threads_enter();
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), name);
@ -83,7 +83,7 @@ counter (void *data)
{
sprintf(buffer, "%d", counter);
gtk_label_set_text (GTK_LABEL (label), buffer);
gtk_threads_leave();
gdk_threads_leave();
counter++;
/* Give someone else a chance to get the lock next time.
* Only necessary because we don't do anything else while
@ -91,7 +91,7 @@ counter (void *data)
*/
sleep(0);
gtk_threads_enter();
gdk_threads_enter();
}
gtk_widget_destroy (window);
@ -102,7 +102,7 @@ counter (void *data)
gtk_main_quit();
pthread_mutex_unlock (&nthreads_mutex);
gtk_threads_leave();
gdk_threads_leave();
return NULL;
}
@ -115,7 +115,7 @@ main (int argc, char **argv)
#ifdef USE_PTHREADS
int i;
if (!gtk_threads_init())
if (!gdk_threads_init())
{
fprintf(stderr, "Could not initialize threads\n");
exit(1);
@ -141,9 +141,9 @@ main (int argc, char **argv)
pthread_mutex_unlock (&nthreads_mutex);
gtk_threads_enter();
gdk_threads_enter();
gtk_main();
gtk_threads_leave();
gdk_threads_leave();
fprintf(stderr, "Done\n");
#else /* !USE_PTHREADS */
fprintf (stderr, "GTK+ not compiled with threads support\n");