callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make GtkProgressBar implement GtkOrientable

Browse Source 
This also means that gtk_progress_bar_[sg]et_orientation are
gone.
This commit is contained in:
Matthias Clasen
2010-09-01 23:25:22 -04:00
parent c3a19a4a14
commit 4230f7998b
3 changed files with 10 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtk.symbols
View File

@ -2569,7 +2569,6 @@ gtk_print_win32_devnames_from_printer_name
#if IN_HEADER(__GTK_PROGRESS_BAR_H__) #if IN_HEADER(__GTK_PROGRESS_BAR_H__)
#if IN_FILE(__GTK_PROGRESS_BAR_C__) #if IN_FILE(__GTK_PROGRESS_BAR_C__)
gtk_progress_bar_get_fraction gtk_progress_bar_get_fraction
gtk_progress_bar_get_orientation
gtk_progress_bar_get_inverted gtk_progress_bar_get_inverted
gtk_progress_bar_get_pulse_step gtk_progress_bar_get_pulse_step
gtk_progress_bar_get_text gtk_progress_bar_get_text
@ -2578,7 +2577,6 @@ gtk_progress_bar_get_type G_GNUC_CONST
gtk_progress_bar_new gtk_progress_bar_new
gtk_progress_bar_pulse gtk_progress_bar_pulse
gtk_progress_bar_set_fraction gtk_progress_bar_set_fraction
gtk_progress_bar_set_orientation
gtk_progress_bar_set_inverted gtk_progress_bar_set_inverted
gtk_progress_bar_set_pulse_step gtk_progress_bar_set_pulse_step
gtk_progress_bar_set_text gtk_progress_bar_set_text

49
gtk/gtkprogressbar.c
View File

@ -29,6 +29,7 @@
#include <string.h> #include <string.h>
#include "gtkprogressbar.h" #include "gtkprogressbar.h"
#include "gtkorientable.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.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_act_mode_enter (GtkProgressBar *progress);
static void gtk_progress_bar_realize (GtkWidget *widget); static void gtk_progress_bar_realize (GtkWidget *widget);
static void gtk_progress_bar_finalize (GObject *object); static void gtk_progress_bar_finalize (GObject *object);
static void gtk_progress_bar_set_orientation (GtkProgressBar *progress,
GtkOrientation orientation);
G_DEFINE_TYPE_WITH_CODE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_WIDGET,
G_DEFINE_TYPE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_WIDGET) G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL))
static void static void
gtk_progress_bar_class_init (GtkProgressBarClass *class) 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_request = gtk_progress_bar_size_request;
widget_class->size_allocate = gtk_progress_bar_size_allocate; widget_class->size_allocate = gtk_progress_bar_size_allocate;
g_object_class_install_property (gobject_class, g_object_class_override_property (gobject_class,
PROP_ORIENTATION, PROP_ORIENTATION,
g_param_spec_enum ("orientation", "orientation");
P_("Orientation"),
P_("Orientation and of the progress bar"),
GTK_TYPE_ORIENTATION,
GTK_ORIENTATION_HORIZONTAL,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_INVERTED, PROP_INVERTED,
@ -1112,22 +1110,11 @@ gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
g_object_notify (G_OBJECT (pbar), "pulse-step"); g_object_notify (G_OBJECT (pbar), "pulse-step");
} }
/** static void
* 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
gtk_progress_bar_set_orientation (GtkProgressBar *pbar, gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
GtkOrientation orientation) GtkOrientation orientation)
{ {
GtkProgressBarPrivate *priv; GtkProgressBarPrivate *priv = pbar->priv;
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
priv = pbar->priv;
if (priv->orientation != orientation) if (priv->orientation != orientation)
{ {
@ -1135,8 +1122,6 @@ gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
if (gtk_widget_is_drawable (GTK_WIDGET (pbar))) if (gtk_widget_is_drawable (GTK_WIDGET (pbar)))
gtk_widget_queue_resize (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; 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: * gtk_progress_bar_get_inverted:
* @pbar: a #GtkProgressBar * @pbar: a #GtkProgressBar

3
gtk/gtkprogressbar.h
View File

@ -90,8 +90,6 @@ void gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
void gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar, void gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
gdouble fraction); gdouble fraction);
void gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
GtkOrientation orientation);
void gtk_progress_bar_set_inverted (GtkProgressBar *pbar, void gtk_progress_bar_set_inverted (GtkProgressBar *pbar,
gboolean inverted); 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_fraction (GtkProgressBar *pbar);
gdouble gtk_progress_bar_get_pulse_step (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); gboolean gtk_progress_bar_get_inverted (GtkProgressBar *pbar);
void gtk_progress_bar_set_ellipsize (GtkProgressBar *pbar, void gtk_progress_bar_set_ellipsize (GtkProgressBar *pbar,
PangoEllipsizeMode mode); PangoEllipsizeMode mode);