Use subdirectories with icon sizes.

[inkscape.git] / src / widgets / sp-widget.cpp

diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index cf40b2c73d441ebb7b02158e8d1c6595008c9969..f694c461ce5ca877eafdf5ccf998c500b906d39a 100644 (file)
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -46,10 +46,14 @@ static guint signals[LAST_SIGNAL] = {0};
 GtkType
 sp_widget_get_type (void)
 {
+    //TODO: switch to GObject
+    // GtkType and such calls were deprecated a while back with the
+    // introduction of GObject as a separate layer, with GType instead. --JonCruz
+
        static GtkType type = 0;
        if (!type) {
                static const GtkTypeInfo info = {
-                       "SPWidget",
+                       (gchar*) "SPWidget",
                        sizeof (SPWidget),
                        sizeof (SPWidgetClass),
                        (GtkClassInitFunc) sp_widget_class_init,
@@ -124,7 +128,7 @@ sp_widget_destroy (GtkObject *object)
 
        if (spw->inkscape) {
                /* Disconnect signals */
-               // the checks are necessary because when destroy is caused by the the program shutting down, 
+               // the checks are necessary because when destroy is caused by the the program shutting down,
                // the inkscape object may already be (partly?) invalid --bb
                if (G_IS_OBJECT(spw->inkscape) && G_OBJECT_GET_CLASS(G_OBJECT(spw->inkscape)))
                        sp_signal_disconnect_by_data (spw->inkscape, spw);
@@ -241,22 +245,32 @@ sp_widget_construct_global (SPWidget *spw, Inkscape::Application *inkscape)
 }
 
 static void
-sp_widget_modify_selection (Inkscape::Application *inkscape, Inkscape::Selection *selection, guint flags, SPWidget *spw)
+sp_widget_modify_selection (Inkscape::Application */*inkscape*/, Inkscape::Selection *selection, guint flags, SPWidget *spw)
 {
        g_signal_emit (G_OBJECT (spw), signals[MODIFY_SELECTION], 0, selection, flags);
 }
 
 static void
-sp_widget_change_selection (Inkscape::Application *inkscape, Inkscape::Selection *selection, SPWidget *spw)
+sp_widget_change_selection (Inkscape::Application */*inkscape*/, Inkscape::Selection *selection, SPWidget *spw)
 {
        g_signal_emit (G_OBJECT (spw), signals[CHANGE_SELECTION], 0, selection);
 }
 
 static void
-sp_widget_set_selection (Inkscape::Application *inkscape, Inkscape::Selection *selection, SPWidget *spw)
+sp_widget_set_selection (Inkscape::Application */*inkscape*/, Inkscape::Selection *selection, SPWidget *spw)
 {
        /* Emit "set_selection" signal */
        g_signal_emit (G_OBJECT (spw), signals[SET_SELECTION], 0, selection);
        /* Inkscape will force "change_selection" anyways */
 }
 
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :