summaryrefslogtreecommitdiffstats
path: root/src/widgets/button.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-11-14 16:07:45 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-11-14 16:07:45 +0000
commit0d3cb2271366191c5cc414fc1bf8f41aaa046068 (patch)
tree56015cf8999ee17546cdc448b7f9fdae389e0fe5 /src/widgets/button.cpp
parentchanges_2012_11_13a.patch (diff)
parentemf import. modify sequence of operations to load file EMF_Illustrator_a4.emf... (diff)
downloadinkscape-0d3cb2271366191c5cc414fc1bf8f41aaa046068.tar.gz
inkscape-0d3cb2271366191c5cc414fc1bf8f41aaa046068.zip
merge from trunk (r11871)
(bzr r11668.1.41)
Diffstat (limited to 'src/widgets/button.cpp')
-rw-r--r--src/widgets/button.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 45356601b..1ac083276 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -218,9 +218,7 @@ sp_button_perform_action (SPButton *button, gpointer /*data*/)
GtkWidget *
sp_button_new( Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action )
{
- SPButton *button;
-
- button = (SPButton *)g_object_new (SP_TYPE_BUTTON, NULL);
+ SPButton *button = SP_BUTTON(g_object_new(SP_TYPE_BUTTON, NULL));
button->type = type;
button->lsize = CLAMP( size, Inkscape::ICON_SIZE_MENU, Inkscape::ICON_SIZE_DECORATION );