]> Pileus Git - ~andy/gtk/commitdiff
spinner: We're a no-window widget, so setting a colormap does nothing
authorBenjamin Otte <otte@redhat.com>
Sat, 28 Aug 2010 14:51:52 +0000 (16:51 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 26 Sep 2010 13:11:31 +0000 (15:11 +0200)
gtk/gtkspinner.c

index a52b3c089b351d9f52778811c617f075bf1f0070..b3da6dd6d120a2ec8473fcf650913fa3c38621e7 100644 (file)
@@ -75,8 +75,6 @@ static void gtk_spinner_map            (GtkWidget       *widget);
 static void gtk_spinner_unmap          (GtkWidget       *widget);
 static gboolean gtk_spinner_expose     (GtkWidget       *widget,
                                         GdkEventExpose  *event);
-static void gtk_spinner_screen_changed (GtkWidget       *widget,
-                                        GdkScreen       *old_screen);
 static void gtk_spinner_style_set      (GtkWidget       *widget,
                                         GtkStyle        *prev_style);
 static void gtk_spinner_get_property   (GObject         *object,
@@ -113,7 +111,6 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
   widget_class->map = gtk_spinner_map;
   widget_class->unmap = gtk_spinner_unmap;
   widget_class->expose_event = gtk_spinner_expose;
-  widget_class->screen_changed = gtk_spinner_screen_changed;
   widget_class->style_set = gtk_spinner_style_set;
   widget_class->get_accessible = gtk_spinner_get_accessible;
 
@@ -343,26 +340,6 @@ gtk_spinner_unmap (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_spinner_parent_class)->unmap (widget);
 }
 
-static void
-gtk_spinner_screen_changed (GtkWidget* widget, GdkScreen* old_screen)
-{
-  GtkSpinner *spinner;
-  GdkScreen* new_screen;
-  GdkColormap* colormap;
-
-  spinner = GTK_SPINNER (widget);
-
-  new_screen = gtk_widget_get_screen (widget);
-  colormap = gdk_screen_get_rgba_colormap (new_screen);
-
-  if (!colormap)
-    {
-      colormap = gdk_screen_get_default_colormap (new_screen);
-    }
-
-  gtk_widget_set_colormap (widget, colormap);
-}
-
 static void
 gtk_spinner_style_set (GtkWidget *widget,
                        GtkStyle  *prev_style)