Rename GdkQuartzWindow.h and .c to GdkQuartzNSWindow.h and .c

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

diff --git a/tests/testdnd.c b/tests/testdnd.c
index f2cc795106645bdeef9cb97e6a048a0f2b31460f..375e5ab854815d29c63361a80be398d324e9b74d 100644 (file)
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -24,7 +24,7 @@
 /* Target side drag signals */
 
 /* XPM */
-static char * drag_icon_xpm[] = {
+static const char * drag_icon_xpm[] = {
 "36 48 9 1",
 "      c None",
 ".     c #020204",
@@ -85,7 +85,7 @@ static char * drag_icon_xpm[] = {
 "...................................."};
 
 /* XPM */
-static char * trashcan_closed_xpm[] = {
+static const char * trashcan_closed_xpm[] = {
 "64 80 17 1",
 "      c None",
 ".     c #030304",
@@ -186,7 +186,7 @@ static char * trashcan_closed_xpm[] = {
 "                                                                "};
 
 /* XPM */
-static char * trashcan_open_xpm[] = {
+static const char * trashcan_open_xpm[] = {
 "64 80 17 1",
 "      c None",
 ".     c #030304",
@@ -286,10 +286,8 @@ static char * trashcan_open_xpm[] = {
 "                                                                ",
 "                                                                "};
 
-GdkPixmap *trashcan_open;
-GdkPixmap *trashcan_open_mask;
-GdkPixmap *trashcan_closed;
-GdkPixmap *trashcan_closed_mask;
+GdkPixbuf *trashcan_open;
+GdkPixbuf *trashcan_closed;
 
 gboolean have_drag;
 
@@ -313,8 +311,7 @@ target_drag_leave      (GtkWidget          *widget,
 {
   g_print("leave\n");
   have_drag = FALSE;
-  gtk_image_set_from_pixmap (GTK_IMAGE (widget),
-                            trashcan_closed, trashcan_closed_mask);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (widget), trashcan_closed);
 }
 
 gboolean
@@ -330,16 +327,15 @@ target_drag_motion           (GtkWidget          *widget,
   if (!have_drag)
     {
       have_drag = TRUE;
-      gtk_image_set_from_pixmap (GTK_IMAGE (widget),
-                                trashcan_open, trashcan_open_mask);
+      gtk_image_set_from_pixbuf (GTK_IMAGE (widget), trashcan_open);
     }
 
   source_widget = gtk_drag_get_source_widget (context);
   g_print ("motion, source %s\n", source_widget ?
-          GTK_OBJECT_TYPE_NAME (source_widget) :
+          G_OBJECT_TYPE_NAME (source_widget) :
           "NULL");
 
-  tmp_list = context->targets;
+  tmp_list = gdk_drag_context_list_targets (context);
   while (tmp_list)
     {
       char *name = gdk_atom_name (GDK_POINTER_TO_ATOM (tmp_list->data));
@@ -349,7 +345,8 @@ target_drag_motion     (GtkWidget          *widget,
       tmp_list = tmp_list->next;
     }
 
-  gdk_drag_status (context, context->suggested_action, time);
+  gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), time);
+
   return TRUE;
 }
 
@@ -363,13 +360,12 @@ target_drag_drop     (GtkWidget          *widget,
   g_print("drop\n");
   have_drag = FALSE;
 
-  gtk_image_set_from_pixmap (GTK_IMAGE (widget),
-                            trashcan_closed, trashcan_closed_mask);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (widget), trashcan_closed);
 
-  if (context->targets)
+  if (gdk_drag_context_list_targets (context))
     {
-      gtk_drag_get_data (widget, context, 
-                        GDK_POINTER_TO_ATOM (context->targets->data), 
+      gtk_drag_get_data (widget, context,
+                        GDK_POINTER_TO_ATOM (gdk_drag_context_list_targets (context)->data),
                         time);
       return TRUE;
     }
@@ -382,13 +378,14 @@ target_drag_data_received  (GtkWidget          *widget,
                            GdkDragContext     *context,
                            gint                x,
                            gint                y,
-                           GtkSelectionData   *data,
+                           GtkSelectionData   *selection_data,
                            guint               info,
                            guint               time)
 {
-  if ((data->length >= 0) && (data->format == 8))
+  if (gtk_selection_data_get_length (selection_data) >= 0 &&
+      gtk_selection_data_get_format (selection_data) == 8)
     {
-      g_print ("Received \"%s\" in trashcan\n", (gchar *)data->data);
+      g_print ("Received \"%s\" in trashcan\n", (gchar *) gtk_selection_data_get_data (selection_data));
       gtk_drag_finish (context, TRUE, FALSE, time);
       return;
     }
@@ -401,13 +398,14 @@ label_drag_data_received  (GtkWidget          *widget,
                            GdkDragContext     *context,
                            gint                x,
                            gint                y,
-                           GtkSelectionData   *data,
+                           GtkSelectionData   *selection_data,
                            guint               info,
                            guint               time)
 {
-  if ((data->length >= 0) && (data->format == 8))
+  if (gtk_selection_data_get_length (selection_data) >= 0 &&
+      gtk_selection_data_get_format (selection_data) == 8)
     {
-      g_print ("Received \"%s\" in label\n", (gchar *)data->data);
+      g_print ("Received \"%s\" in label\n", (gchar *) gtk_selection_data_get_data (selection_data));
       gtk_drag_finish (context, TRUE, FALSE, time);
       return;
     }
@@ -427,7 +425,7 @@ source_drag_data_get  (GtkWidget          *widget,
     g_print ("I was dropped on the rootwin\n");
   else
     gtk_selection_data_set (selection_data,
-                           selection_data->target,
+                           gtk_selection_data_get_target (selection_data),
                            8, (guchar *) "I'm Data!", 9);
 }
   
@@ -581,8 +579,8 @@ test_init (void)
   if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
                   G_FILE_TEST_EXISTS))
     {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
     }
 }
 
@@ -594,8 +592,7 @@ main (int argc, char **argv)
   GtkWidget *label;
   GtkWidget *pixmap;
   GtkWidget *button;
-  GdkPixmap *drag_icon;
-  GdkPixmap *drag_mask;
+  GdkPixbuf *drag_icon;
 
   test_init ();
   
@@ -609,19 +606,9 @@ main (int argc, char **argv)
   table = gtk_table_new (2, 2, FALSE);
   gtk_container_add (GTK_CONTAINER (window), table);
 
-  drag_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL,
-                                                    gtk_widget_get_colormap (window),
-                                                    &drag_mask,
-                                                    NULL, drag_icon_xpm);
-
-  trashcan_open = gdk_pixmap_colormap_create_from_xpm_d (NULL,
-                                                        gtk_widget_get_colormap (window),
-                                                        &trashcan_open_mask,
-                                                        NULL, trashcan_open_xpm);
-  trashcan_closed = gdk_pixmap_colormap_create_from_xpm_d (NULL,
-                                                          gtk_widget_get_colormap (window),
-                                                          &trashcan_closed_mask,
-                                                          NULL, trashcan_closed_xpm);
+  drag_icon = gdk_pixbuf_new_from_xpm_data (drag_icon_xpm);
+  trashcan_open = gdk_pixbuf_new_from_xpm_data (trashcan_open_xpm);
+  trashcan_closed = gdk_pixbuf_new_from_xpm_data (trashcan_closed_xpm);
   
   label = gtk_label_new ("Drop Here\n");
 
@@ -653,7 +640,7 @@ main (int argc, char **argv)
   g_signal_connect (label, "drag_leave",
                    G_CALLBACK (popsite_leave), NULL);
   
-  pixmap = gtk_image_new_from_pixmap (trashcan_closed, trashcan_closed_mask);
+  pixmap = gtk_image_new_from_pixbuf (trashcan_closed);
   gtk_drag_dest_set (pixmap, 0, NULL, 0, 0);
   gtk_table_attach (GTK_TABLE (table), pixmap, 1, 2, 0, 1,
                    GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
@@ -678,12 +665,9 @@ main (int argc, char **argv)
   gtk_drag_source_set (button, GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
                       target_table, n_targets, 
                       GDK_ACTION_COPY | GDK_ACTION_MOVE);
-  gtk_drag_source_set_icon (button, 
-                           gtk_widget_get_colormap (window),
-                           drag_icon, drag_mask);
+  gtk_drag_source_set_icon_pixbuf (button, drag_icon);
 
   g_object_unref (drag_icon);
-  g_object_unref (drag_mask);
 
   gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2,
                    GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,