Use GtkComboBox instead of GtkCombo in testsocket

[~andy/gtk] / tests / testinput.c

diff --git a/tests/testinput.c b/tests/testinput.c
index 4734284b967e6bf074d39e84229a38758ab81b2c..c334944b4d4c6bd9aa97724f1a4a5c69176f1e25 100644 (file)
--- a/tests/testinput.c
+++ b/tests/testinput.c
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <stdio.h>
 #include "gtk/gtk.h"
@@ -54,7 +56,7 @@ update_cursor (GtkWidget *widget,  gdouble x, gdouble y)
                             x != cursor_x || y != cursor_y))
        {
          gdk_draw_drawable (widget->window,
-                            widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                            widget->style->fg_gc[gtk_widget_get_state (widget)],
                             pixmap,
                             cursor_x - 5, cursor_y - 5,
                             cursor_x - 5, cursor_y - 5,
@@ -101,7 +103,7 @@ static gint
 expose_event (GtkWidget *widget, GdkEventExpose *event)
 {
   gdk_draw_drawable (widget->window,
-                    widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                    widget->style->fg_gc[gtk_widget_get_state (widget)],
                     pixmap,
                     event->area.x, event->area.y,
                     event->area.x, event->area.y,
@@ -122,7 +124,7 @@ draw_brush (GtkWidget *widget, GdkInputSource source,
   switch (source)
     {
     case GDK_SOURCE_MOUSE:
-      gc = widget->style->dark_gc[GTK_WIDGET_STATE (widget)];
+      gc = widget->style->dark_gc[gtk_widget_get_state (widget)];
       break;
     case GDK_SOURCE_PEN:
       gc = widget->style->black_gc;
@@ -131,7 +133,7 @@ draw_brush (GtkWidget *widget, GdkInputSource source,
       gc = widget->style->white_gc;
       break;
     default:
-      gc = widget->style->light_gc[GTK_WIDGET_STATE (widget)];
+      gc = widget->style->light_gc[gtk_widget_get_state (widget)];
     }
 
   update_rect.x = x - 10 * pressure;
@@ -266,40 +268,6 @@ leave_notify_event (GtkWidget *widget, GdkEventCrossing *event)
   return TRUE;
 }
 
-void
-input_dialog_destroy (GtkWidget *w, gpointer data)
-{
-  *((GtkWidget **)data) = NULL;
-}
-
-void
-create_input_dialog (void)
-{
-  static GtkWidget *inputd = NULL;
-
-  if (!inputd)
-    {
-      inputd = gtk_input_dialog_new ();
-
-      g_signal_connect (inputd, "destroy",
-                       G_CALLBACK (input_dialog_destroy), &inputd);
-      g_signal_connect_swapped (GTK_INPUT_DIALOG (inputd)->close_button,
-                               "clicked",
-                               G_CALLBACK (gtk_widget_hide),
-                               inputd);
-      gtk_widget_hide (GTK_INPUT_DIALOG (inputd)->save_button);
-
-      gtk_widget_show (inputd);
-    }
-  else
-    {
-      if (!GTK_WIDGET_MAPPED(inputd))
-       gtk_widget_show(inputd);
-      else
-       gdk_window_raise(inputd->window);
-    }
-}
-
 void
 quit (void)
 {
@@ -370,17 +338,10 @@ main (int argc, char *argv[])
      events for the drawing area */
   gtk_widget_set_extension_events (drawing_area, GDK_EXTENSION_EVENTS_ALL);
 
-  GTK_WIDGET_SET_FLAGS (drawing_area, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (drawing_area, TRUE);
   gtk_widget_grab_focus (drawing_area);
 
   /* .. And create some buttons */
-  button = gtk_button_new_with_label ("Input Dialog");
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-  g_signal_connect (button, "clicked",
-                   G_CALLBACK (create_input_dialog), NULL);
-  gtk_widget_show (button);
-
   button = gtk_button_new_with_label ("Quit");
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);