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

Get rid of GtkProgress

Browse Source 
The entire api was deprecated since 2.0. This patch detangles
GtkProgress from GtkProgressBar and moves all the pieces into
GtkProgressBar that are required for non-deprecated progressbar
functionality.

Bug #620618
This commit is contained in:
Matthias Clasen
2010-06-09 00:29:55 -04:00
parent 882660e13d
commit 5e0dfed135
11 changed files with 570 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
modules/other/gail/gailprogressbar.c
View File

@ -32,8 +32,6 @@ static void gail_progress_bar_class_init (GailProgressBarClass *klass);
static void gail_progress_bar_init (GailProgressBar *bar);
static void gail_progress_bar_real_initialize (AtkObject *obj,
gpointer data);
static void gail_progress_bar_finalize (GObject *object);
static void atk_value_interface_init (AtkValueIface *iface);
@ -47,13 +45,11 @@ static void gail_progress_bar_get_maximum_value (AtkValue *obj,
GValue *value);
static void gail_progress_bar_get_minimum_value (AtkValue *obj,
GValue *value);
static void gail_progress_bar_value_changed (GtkAdjustment *adjustment,
gpointer data);
G_DEFINE_TYPE_WITH_CODE (GailProgressBar, gail_progress_bar, GAIL_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void
static void
gail_progress_bar_class_init (GailProgressBarClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@ -65,8 +61,6 @@ gail_progress_bar_class_init (GailProgressBarClass *klass)
widget_class->notify_gtk = gail_progress_bar_real_notify_gtk;
class->initialize = gail_progress_bar_real_initialize;
gobject_class->finalize = gail_progress_bar_finalize;
}
static void
@ -79,30 +73,13 @@ gail_progress_bar_real_initialize (AtkObject *obj,
gpointer data)
{
GailProgressBar *progress_bar = GAIL_PROGRESS_BAR (obj);
GtkProgress *gtk_progress;
ATK_OBJECT_CLASS (gail_progress_bar_parent_class)->initialize (obj, data);
gtk_progress = GTK_PROGRESS (data);
/*
* If a GtkAdjustment already exists for the spin_button,
* create the GailAdjustment
*/
if (gtk_progress->adjustment)
{
progress_bar->adjustment = gail_adjustment_new (gtk_progress->adjustment);
g_signal_connect (gtk_progress->adjustment,
"value-changed",
G_CALLBACK (gail_progress_bar_value_changed),
obj);
}
else
progress_bar->adjustment = NULL;
obj->role = ATK_ROLE_PROGRESS_BAR;
}
static void
static void
atk_value_interface_init (AtkValueIface *iface)
{
iface->get_current_value = gail_progress_bar_get_current_value;
@ -110,75 +87,37 @@ atk_value_interface_init (AtkValueIface *iface)
iface->get_minimum_value = gail_progress_bar_get_minimum_value;
}
static void
static void
gail_progress_bar_get_current_value (AtkValue *obj,
GValue *value)
{
GailProgressBar *progress_bar;
GtkWidget *widget;
g_return_if_fail (GAIL_IS_PROGRESS_BAR (obj));
progress_bar = GAIL_PROGRESS_BAR (obj);
if (progress_bar->adjustment == NULL)
/*
* Adjustment has not been specified
*/
return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
atk_value_get_current_value (ATK_VALUE (progress_bar->adjustment), value);
g_value_set_double (value, gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (widget)));
}
static void
static void
gail_progress_bar_get_maximum_value (AtkValue *obj,
GValue *value)
{
GailProgressBar *progress_bar;
g_return_if_fail (GAIL_IS_PROGRESS_BAR (obj));
progress_bar = GAIL_PROGRESS_BAR (obj);
if (progress_bar->adjustment == NULL)
/*
* Adjustment has not been specified
*/
return;
atk_value_get_maximum_value (ATK_VALUE (progress_bar->adjustment), value);
g_value_set_double (value, 1.0);
}
static void
gail_progress_bar_get_minimum_value (AtkValue *obj,
GValue *value)
{
GailProgressBar *progress_bar;
g_return_if_fail (GAIL_IS_PROGRESS_BAR (obj));
progress_bar = GAIL_PROGRESS_BAR (obj);
if (progress_bar->adjustment == NULL)
/*
* Adjustment has not been specified
*/
return;
atk_value_get_minimum_value (ATK_VALUE (progress_bar->adjustment), value);
g_value_set_double (value, 0.0);
}
static void
gail_progress_bar_finalize (GObject *object)
{
GailProgressBar *progress_bar = GAIL_PROGRESS_BAR (object);
if (progress_bar->adjustment)
{
g_object_unref (progress_bar->adjustment);
progress_bar->adjustment = NULL;
}
G_OBJECT_CLASS (gail_progress_bar_parent_class)->finalize (object);
}
static void
gail_progress_bar_real_notify_gtk (GObject *obj,
GParamSpec *pspec)
@ -186,41 +125,8 @@ gail_progress_bar_real_notify_gtk (GObject *obj,
GtkWidget *widget = GTK_WIDGET (obj);
GailProgressBar *progress_bar = GAIL_PROGRESS_BAR (gtk_widget_get_accessible (widget));
if (strcmp (pspec->name, "adjustment") == 0)
{
/*
* Get rid of the GailAdjustment for the GtkAdjustment
* which was associated with the progress_bar.
*/
if (progress_bar->adjustment)
{
g_object_unref (progress_bar->adjustment);
progress_bar->adjustment = NULL;
}
/*
* Create the GailAdjustment when notify for "adjustment" property
* is received
*/
progress_bar->adjustment = gail_adjustment_new (GTK_PROGRESS (widget)->adjustment);
g_signal_connect (GTK_PROGRESS (widget)->adjustment,
"value-changed",
G_CALLBACK (gail_progress_bar_value_changed),
progress_bar);
}
if (strcmp (pspec->name, "fraction") == 0)
g_object_notify (G_OBJECT (progress_bar), "accessible-value");
else
GAIL_WIDGET_CLASS (gail_progress_bar_parent_class)->notify_gtk (obj, pspec);
}
static void
gail_progress_bar_value_changed (GtkAdjustment *adjustment,
gpointer data)
{
GailProgressBar *progress_bar;
g_return_if_fail (adjustment != NULL);
g_return_if_fail (data != NULL);
progress_bar = GAIL_PROGRESS_BAR (data);
g_object_notify (G_OBJECT (progress_bar), "accessible-value");
}

2
modules/other/gail/gailprogressbar.h
View File

@ -37,8 +37,6 @@ typedef struct _GailProgressBarClass GailProgressBarClass;
struct _GailProgressBar
{
GailWidget parent;
AtkObject *adjustment;
};
GType gail_progress_bar_get_type (void);