diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-01-22 14:40:50 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-01-22 14:40:50 +0000 |
| commit | 34baadb48632ee5c2f39cba0411b7810265bdc6a (patch) | |
| tree | c7a76b25fd57605c40082d32644ff9a0da22d20e /src/sp-switch.cpp | |
| parent | merge from trunk (r12005) (diff) | |
| parent | Filters. Add missing inkscape namespace declaration for 'Channel Painting' (diff) | |
| download | inkscape-34baadb48632ee5c2f39cba0411b7810265bdc6a.tar.gz inkscape-34baadb48632ee5c2f39cba0411b7810265bdc6a.zip | |
merge from trunk (r12051)
(bzr r11668.1.48)
Diffstat (limited to 'src/sp-switch.cpp')
| -rw-r--r-- | src/sp-switch.cpp | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp index 500e43c9c..be9866e16 100644 --- a/src/sp-switch.cpp +++ b/src/sp-switch.cpp @@ -25,35 +25,11 @@ #include <sigc++/functors/ptr_fun.h> #include <sigc++/adaptors/bind.h> -static void sp_switch_class_init (SPSwitchClass *klass); -static void sp_switch_init (SPSwitch *group); - -static SPGroupClass * parent_class; - -GType CSwitch::getType (void) -{ - static GType switch_type = 0; - if (!switch_type) { - GTypeInfo switch_info = { - sizeof (SPSwitchClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) sp_switch_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (SPSwitch), - 16, /* n_preallocs */ - (GInstanceInitFunc) sp_switch_init, - NULL, /* value_table */ - }; - switch_type = g_type_register_static (SP_TYPE_GROUP, "SPSwitch", &switch_info, (GTypeFlags)0); - } - return switch_type; -} +G_DEFINE_TYPE(SPSwitch, sp_switch, SP_TYPE_GROUP); static void -sp_switch_class_init (SPSwitchClass *) { - parent_class = (SPGroupClass *)g_type_class_ref (SP_TYPE_GROUP); +sp_switch_class_init (SPSwitchClass *) +{ } static void sp_switch_init (SPSwitch *group) |