[gnome-shell/wip/clutter-deprecation-fixes: 18/25] st: Remove custom paint/pick implementations

[Jasper St. Pierre <jstpierre src gnome org>]

commit 5d0e9db0a784f8b1c88d917646fe1ab76d290bbb
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Feb 13 22:52:01 2012 -0500

    st: Remove custom paint/pick implementations
    
    As lots of these paint widgets simply paint/pick what were previously
    pseudo-children, or when we converted them to real children we no longer
    need the custom paint/pick methods

 src/st/st-bin.c        |   28 ----------------------------
 src/st/st-entry.c      |   37 -------------------------------------
 src/st/st-scroll-bar.c |   35 -----------------------------------
 3 files changed, 0 insertions(+), 100 deletions(-)
---
diff --git a/src/st/st-bin.c b/src/st/st-bin.c
index 4ca6400..9ff0e9c 100644
--- a/src/st/st-bin.c
+++ b/src/st/st-bin.c
@@ -105,32 +105,6 @@ clutter_container_iface_init (ClutterContainerIface *iface)
 }
 
 static void
-st_bin_paint (ClutterActor *self)
-{
-  StBinPrivate *priv = ST_BIN (self)->priv;
-
-  /* allow StWidget to paint the background */
-  CLUTTER_ACTOR_CLASS (st_bin_parent_class)->paint (self);
-
-  /* the pain our child */
-  if (priv->child)
-    clutter_actor_paint (priv->child);
-}
-
-static void
-st_bin_pick (ClutterActor       *self,
-             const ClutterColor *pick_color)
-{
-  StBinPrivate *priv = ST_BIN (self)->priv;
-
-  /* get the default pick implementation */
-  CLUTTER_ACTOR_CLASS (st_bin_parent_class)->pick (self, pick_color);
-
-  if (priv->child)
-    clutter_actor_paint (priv->child);
-}
-
-static void
 st_bin_allocate (ClutterActor          *self,
                  const ClutterActorBox *box,
                  ClutterAllocationFlags flags)
@@ -339,8 +313,6 @@ st_bin_class_init (StBinClass *klass)
   actor_class->get_preferred_width = st_bin_get_preferred_width;
   actor_class->get_preferred_height = st_bin_get_preferred_height;
   actor_class->allocate = st_bin_allocate;
-  actor_class->paint = st_bin_paint;
-  actor_class->pick = st_bin_pick;
 
   widget_class->navigate_focus = st_bin_navigate_focus;
 
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 1f302ed..95eaf4d 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -511,41 +511,6 @@ clutter_text_password_char_cb (GObject    *object,
 }
 
 static void
-st_entry_paint (ClutterActor *actor)
-{
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
-  ClutterActorClass *parent_class;
-
-  parent_class = CLUTTER_ACTOR_CLASS (st_entry_parent_class);
-  parent_class->paint (actor);
-
-  clutter_actor_paint (priv->entry);
-
-  if (priv->primary_icon)
-    clutter_actor_paint (priv->primary_icon);
-
-  if (priv->secondary_icon)
-    clutter_actor_paint (priv->secondary_icon);
-}
-
-static void
-st_entry_pick (ClutterActor       *actor,
-               const ClutterColor *c)
-{
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
-
-  CLUTTER_ACTOR_CLASS (st_entry_parent_class)->pick (actor, c);
-
-  clutter_actor_paint (priv->entry);
-
-  if (priv->primary_icon)
-    clutter_actor_paint (priv->primary_icon);
-
-  if (priv->secondary_icon)
-    clutter_actor_paint (priv->secondary_icon);
-}
-
-static void
 st_entry_clipboard_callback (StClipboard *clipboard,
                              const gchar *text,
                              gpointer     data)
@@ -658,8 +623,6 @@ st_entry_class_init (StEntryClass *klass)
   actor_class->get_preferred_width = st_entry_get_preferred_width;
   actor_class->get_preferred_height = st_entry_get_preferred_height;
   actor_class->allocate = st_entry_allocate;
-  actor_class->paint = st_entry_paint;
-  actor_class->pick = st_entry_pick;
 
   actor_class->key_press_event = st_entry_key_press_event;
   actor_class->key_focus_in = st_entry_key_focus_in;
diff --git a/src/st/st-scroll-bar.c b/src/st/st-scroll-bar.c
index 9fdbbb1..4609bb1 100644
--- a/src/st/st-scroll-bar.c
+++ b/src/st/st-scroll-bar.c
@@ -210,39 +210,6 @@ st_scroll_bar_dispose (GObject *gobject)
 }
 
 static void
-st_scroll_bar_paint (ClutterActor *actor)
-{
-  StScrollBarPrivate *priv = ST_SCROLL_BAR (actor)->priv;
-
-  CLUTTER_ACTOR_CLASS (st_scroll_bar_parent_class)->paint (actor);
-
-  clutter_actor_paint (priv->bw_stepper);
-
-  clutter_actor_paint (priv->fw_stepper);
-
-  clutter_actor_paint (priv->trough);
-
-  if (priv->handle && CLUTTER_ACTOR_IS_VISIBLE (priv->handle))
-    clutter_actor_paint (priv->handle);
-}
-
-static void
-st_scroll_bar_pick (ClutterActor       *actor,
-                    const ClutterColor *pick_color)
-{
-  StScrollBarPrivate *priv = ST_SCROLL_BAR (actor)->priv;
-
-  CLUTTER_ACTOR_CLASS (st_scroll_bar_parent_class)->pick (actor, pick_color);
-
-  clutter_actor_paint (priv->bw_stepper);
-  clutter_actor_paint (priv->fw_stepper);
-  clutter_actor_paint (priv->trough);
-
-  if (priv->handle && priv->adjustment)
-    clutter_actor_paint (priv->handle);
-}
-
-static void
 st_scroll_bar_unmap (ClutterActor *actor)
 {
   CLUTTER_ACTOR_CLASS (st_scroll_bar_parent_class)->unmap (actor);
@@ -659,8 +626,6 @@ st_scroll_bar_class_init (StScrollBarClass *klass)
   actor_class->get_preferred_width  = st_scroll_bar_get_preferred_width;
   actor_class->get_preferred_height = st_scroll_bar_get_preferred_height;
   actor_class->allocate       = st_scroll_bar_allocate;
-  actor_class->paint          = st_scroll_bar_paint;
-  actor_class->pick           = st_scroll_bar_pick;
   actor_class->scroll_event   = st_scroll_bar_scroll_event;
   actor_class->unmap          = st_scroll_bar_unmap;