diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-05-05 11:58:23 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-05-05 11:58:23 +0000 |
| commit | 129e599f69d69970d27f827159d563d58c7831b9 (patch) | |
| tree | fa15e756067f688a61f39da90793d4da90ea0176 /src/widgets/paint-selector.cpp | |
| parent | merge from trunk (r12305) (diff) | |
| parent | Fix for 1171434 : trunk: INX <optiongroup> broken^ (diff) | |
| download | inkscape-129e599f69d69970d27f827159d563d58c7831b9.tar.gz inkscape-129e599f69d69970d27f827159d563d58c7831b9.zip | |
merge from trunk (r12322)
(bzr r11668.1.69)
Diffstat (limited to 'src/widgets/paint-selector.cpp')
| -rw-r--r-- | src/widgets/paint-selector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index b0738b6a6..08058d60d 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -1138,14 +1138,14 @@ static void sp_paint_selector_set_mode_swatch(SPPaintSelector *psel, SPPaintSele gtk_widget_set_sensitive(psel->style, TRUE); - SwatchSelector *swatchsel = 0; + SwatchSelector *swatchsel = NULL; if (psel->mode == SPPaintSelector::MODE_SWATCH){ - swatchsel = static_cast<SwatchSelector*>(g_object_get_data(G_OBJECT(psel->selector), "swatch-selector")); + // swatchsel = static_cast<SwatchSelector*>(g_object_get_data(G_OBJECT(psel->selector), "swatch-selector")); } else { sp_paint_selector_clear_frame(psel); // Create new gradient selector - SwatchSelector *swatchsel = new SwatchSelector(); + swatchsel = new SwatchSelector(); swatchsel->show(); swatchsel->connectGrabbedHandler( G_CALLBACK(sp_paint_selector_gradient_grabbed), psel ); |