diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-01-06 19:53:50 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Cenoz <jtx@jtx.marker.es> | 2013-01-06 19:53:50 +0000 |
| commit | 38cba87ca97f83927c94519eda2c326c8bde16cd (patch) | |
| tree | 0390c36513eaf3ab61ff9b182000e63bfc592ffe /src/widgets/button.cpp | |
| parent | Fixed StartAnchor continue errors with bspline (diff) | |
| parent | visual bbox minimum width (Bug 1094802) (diff) | |
| download | inkscape-38cba87ca97f83927c94519eda2c326c8bde16cd.tar.gz inkscape-38cba87ca97f83927c94519eda2c326c8bde16cd.zip | |
Update to trunk
(bzr r11950.1.14)
Diffstat (limited to 'src/widgets/button.cpp')
| -rw-r--r-- | src/widgets/button.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 1ac083276..d7be6c9f0 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -76,11 +76,11 @@ GType sp_button_get_type(void) static void sp_button_class_init (SPButtonClass *klass) { - GObjectClass *object_class=(GObjectClass *)klass; - GtkWidgetClass *widget_class=(GtkWidgetClass *)klass; - GtkButtonClass *button_class=(GtkButtonClass *)klass; + GObjectClass *object_class=G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class=GTK_WIDGET_CLASS(klass); + GtkButtonClass *button_class=GTK_BUTTON_CLASS(klass); - parent_class = (GtkToggleButtonClass *)g_type_class_peek_parent (klass); + parent_class = GTK_TOGGLE_BUTTON_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_button_dispose; #if GTK_CHECK_VERSION(3,0,0) @@ -123,7 +123,7 @@ static void sp_button_dispose(GObject *object) button->c_set_active.~connection(); button->c_set_sensitive.~connection(); - ((GObjectClass *) (parent_class))->dispose(object); + (G_OBJECT_CLASS(parent_class))->dispose(object); } @@ -185,7 +185,7 @@ sp_button_clicked (GtkButton *button) SPButton *sp_button=SP_BUTTON (button); if (sp_button->type == SP_BUTTON_TYPE_TOGGLE) { - ((GtkButtonClass *) (parent_class))->clicked (button); + (GTK_BUTTON_CLASS(parent_class))->clicked (button); } } @@ -230,7 +230,7 @@ sp_button_new( Inkscape::IconSize size, SPButtonType type, SPAction *action, SPA // The Inkscape style is no-relief buttons gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); - return (GtkWidget *) button; + return GTK_WIDGET(button); } void @@ -287,7 +287,7 @@ sp_button_set_action (SPButton *button, SPAction *action) } } - sp_button_set_composed_tooltip ((GtkWidget *) button, action); + sp_button_set_composed_tooltip(GTK_WIDGET(button), action); } static void |