X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftestthreads.c;h=867e44b6143983fda4e2bfecba6ad134baa5e89e;hb=HEAD;hp=c89ad588548116a004eec5a0c8c7ab23aebcb588;hpb=a0c84d6818f278d273b43c651c345f2110bc7f37;p=~andy%2Fgtk

diff --git a/tests/testthreads.c b/tests/testthreads.c
index c89ad5885..867e44b61 100644
--- a/tests/testthreads.c
+++ b/tests/testthreads.c
@@ -2,20 +2,26 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #include <stdio.h>
 #include <unistd.h>
 #include <gtk/gtk.h>
@@ -53,16 +59,16 @@ 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);
-  gtk_widget_set_usize (window, 100, 50);
+  gtk_widget_set_size_request (window, 100, 50);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 
-  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-		      GTK_SIGNAL_FUNC (delete_cb), &flag);
+  g_signal_connect (window, "delete-event",
+                    G_CALLBACK (delete_cb), &flag);
 
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -70,8 +76,8 @@ counter (void *data)
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
   button = gtk_button_new_with_label ("Close");
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		      GTK_SIGNAL_FUNC (close_cb), &flag);
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (close_cb), &flag);
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
   gtk_widget_show_all (window);
@@ -82,8 +88,8 @@ counter (void *data)
   while (!flag)
     {
       sprintf(buffer, "%d", counter);
-      gtk_label_set (GTK_LABEL (label), buffer);
-      gtk_threads_leave();
+      gtk_label_set_text (GTK_LABEL (label), buffer);
+      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 +97,7 @@ counter (void *data)
        */
       sleep(0);
       
-      gtk_threads_enter();
+      gdk_threads_enter();
     }
 
   gtk_widget_destroy (window);
@@ -102,7 +108,7 @@ counter (void *data)
     gtk_main_quit();
   pthread_mutex_unlock (&nthreads_mutex);
 
-  gtk_threads_leave();
+  gdk_threads_leave();
 
   return NULL;
 }
@@ -115,7 +121,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 +147,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");