Make GtkProgressBar implement GtkOrientable

This also means that gtk_progress_bar_[sg]et_orientation are
gone.

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index ae926f87d1a0f0a5497c7ef1093f6bc71a765e34..9f72583da83b174cc335b77d2cb0f2b19715986e 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2569,7 +2569,6 @@ gtk_print_win32_devnames_from_printer_name
 #if IN_HEADER(__GTK_PROGRESS_BAR_H__)
 #if IN_FILE(__GTK_PROGRESS_BAR_C__)
 gtk_progress_bar_get_fraction
-gtk_progress_bar_get_orientation
 gtk_progress_bar_get_inverted
 gtk_progress_bar_get_pulse_step
 gtk_progress_bar_get_text
@@ -2578,7 +2577,6 @@ gtk_progress_bar_get_type G_GNUC_CONST
 gtk_progress_bar_new
 gtk_progress_bar_pulse
 gtk_progress_bar_set_fraction
-gtk_progress_bar_set_orientation
 gtk_progress_bar_set_inverted
 gtk_progress_bar_set_pulse_step
 gtk_progress_bar_set_text

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index d387b857f2b6f342f06cb46fb96a3a5f6a349830..fdb9b9b801fc84342d7fcce7b7c3923da2f047a2 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -29,6 +29,7 @@
 #include <string.h>
 
 #include "gtkprogressbar.h"
+#include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
@@ -92,9 +93,11 @@ static void gtk_progress_bar_paint         (GtkProgressBar      *progress);
 static void gtk_progress_bar_act_mode_enter (GtkProgressBar     *progress);
 static void gtk_progress_bar_realize       (GtkWidget           *widget);
 static void gtk_progress_bar_finalize      (GObject             *object);
+static void gtk_progress_bar_set_orientation (GtkProgressBar    *progress,
+                                              GtkOrientation     orientation);
 
-
-G_DEFINE_TYPE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE_WITH_CODE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_WIDGET,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL))
 
 static void
 gtk_progress_bar_class_init (GtkProgressBarClass *class)
@@ -114,14 +117,9 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
   widget_class->size_request = gtk_progress_bar_size_request;
   widget_class->size_allocate = gtk_progress_bar_size_allocate;
 
-  g_object_class_install_property (gobject_class,
-                                   PROP_ORIENTATION,
-                                   g_param_spec_enum ("orientation",
-                                                      P_("Orientation"),
-                                                      P_("Orientation and of the progress bar"),
-                                                      GTK_TYPE_ORIENTATION,
-                                                      GTK_ORIENTATION_HORIZONTAL,
-                                                      GTK_PARAM_READWRITE));
+  g_object_class_override_property (gobject_class,
+                                    PROP_ORIENTATION,
+                                    "orientation");
 
   g_object_class_install_property (gobject_class,
                                    PROP_INVERTED,
@@ -1112,22 +1110,11 @@ gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
   g_object_notify (G_OBJECT (pbar), "pulse-step");
 }
 
-/**
- * gtk_progress_bar_set_orientation:
- * @pbar: a #GtkProgressBar
- * @orientation: orientation of the progress bar
- *
- * Causes the progress bar to switch to a different orientation.
- */
-void
+static void
 gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
                                   GtkOrientation  orientation)
 {
-  GtkProgressBarPrivate *priv;
-
-  g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
-
-  priv = pbar->priv;
+  GtkProgressBarPrivate *priv = pbar->priv;
 
   if (priv->orientation != orientation)
     {
@@ -1135,8 +1122,6 @@ gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
 
       if (gtk_widget_is_drawable (GTK_WIDGET (pbar)))
         gtk_widget_queue_resize (GTK_WIDGET (pbar));
-
-      g_object_notify (G_OBJECT (pbar), "orientation");
     }
 }
 
@@ -1221,22 +1206,6 @@ gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar)
   return pbar->priv->pulse_fraction;
 }
 
-/**
- * gtk_progress_bar_get_orientation:
- * @pbar: a #GtkProgressBar
- *
- * Retrieves the current progress bar orientation.
- *
- * Return value: orientation of the progress bar
- **/
-GtkOrientation
-gtk_progress_bar_get_orientation (GtkProgressBar *pbar)
-{
-  g_return_val_if_fail (GTK_IS_PROGRESS_BAR (pbar), GTK_ORIENTATION_HORIZONTAL);
-
-  return pbar->priv->orientation;
-}
-
 /**
  * gtk_progress_bar_get_inverted:
  * @pbar: a #GtkProgressBar

diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 5067e5664f39fef14d27ba688e320503dc677f0a..5bf855fd4b480ce09094d88b6711e5d67a616b8b 100644 (file)
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -90,8 +90,6 @@ void       gtk_progress_bar_set_fraction         (GtkProgressBar *pbar,
 
 void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
                                                   gdouble         fraction);
-void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
-                                                  GtkOrientation  orientation);
 void       gtk_progress_bar_set_inverted         (GtkProgressBar *pbar,
                                                   gboolean        inverted);
 
@@ -99,7 +97,6 @@ G_CONST_RETURN gchar* gtk_progress_bar_get_text       (GtkProgressBar *pbar);
 gdouble               gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
 gdouble               gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
 
-GtkOrientation     gtk_progress_bar_get_orientation (GtkProgressBar *pbar);
 gboolean           gtk_progress_bar_get_inverted    (GtkProgressBar *pbar);
 void               gtk_progress_bar_set_ellipsize (GtkProgressBar     *pbar,
                                                    PangoEllipsizeMode  mode);