diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
| commit | e65a02ed32b78534739aba24929ece7c44dd967f (patch) | |
| tree | 13cf022f18f6b5bae46aad4bc339e512f069a514 /src/svg-view-widget.cpp | |
| parent | Pull 2Geom revision 2013 (extra constructors for Rect). (diff) | |
| parent | Text edit dialog: Apply button should grab default only after adding to window (diff) | |
| download | inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip | |
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/svg-view-widget.cpp')
| -rw-r--r-- | src/svg-view-widget.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index 639216d1f..cda1ed546 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -63,15 +63,11 @@ GType sp_svg_view_widget_get_type(void) static void sp_svg_view_widget_class_init (SPSVGSPViewWidgetClass *klass) { - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - SPViewWidgetClass *vw_class; + GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + SPViewWidgetClass *vw_class = SP_VIEW_WIDGET_CLASS (klass); - object_class = GTK_OBJECT_CLASS (klass); - widget_class = GTK_WIDGET_CLASS (klass); - vw_class = SP_VIEW_WIDGET_CLASS (klass); - - widget_parent_class = (SPViewWidgetClass*)gtk_type_class (SP_TYPE_VIEW_WIDGET); + widget_parent_class = (SPViewWidgetClass *)g_type_class_peek_parent (klass); object_class->destroy = sp_svg_view_widget_destroy; @@ -212,7 +208,7 @@ sp_svg_view_widget_new (SPDocument *doc) g_return_val_if_fail (doc != NULL, NULL); - widget = (GtkWidget*)gtk_type_new (SP_TYPE_SVG_VIEW_WIDGET); + widget = (GtkWidget*)g_object_new (SP_TYPE_SVG_VIEW_WIDGET, NULL); reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (widget))->setDocument (doc); |