X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fwidget%2Fselected-style.cpp;h=a8f9f9c60d9ae9e1419d5384471321181721d2cf;hb=7e32c19e78592fbf120af717222bf4185b4bc4e9;hp=e7b0188d81ae138fa505cf25e976125cd1e3cc8b;hpb=42fe2bb464565e5ebcb35adb7d84eb1bd1f9f893;p=inkscape.git diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index e7b0188d8..a8f9f9c60 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -103,7 +103,7 @@ static guint nui_drop_target_entries = ENTRIES_SIZE(ui_drop_target_entries); static Dialog::FillAndStroke *get_fill_and_stroke_panel(SPDesktop *desktop); SelectedStyle::SelectedStyle(bool /*layout*/) - : + : current_stroke_width(0), _desktop (NULL), @@ -955,13 +955,13 @@ SelectedStyle::update() _paintserver_id[i] += ")"; if (SP_IS_LINEARGRADIENT (server)) { - SPGradient *vector = sp_gradient_get_vector(SP_GRADIENT(server), false); + SPGradient *vector = SP_GRADIENT(server)->getVector(); sp_gradient_image_set_gradient ((SPGradientImage *) _gradient_preview_l[i], vector); place->add(_gradient_box_l[i]); _tooltips.set_tip(*place, __lgradient[i]); _mode[i] = SS_LGRADIENT; } else if (SP_IS_RADIALGRADIENT (server)) { - SPGradient *vector = sp_gradient_get_vector(SP_GRADIENT(server), false); + SPGradient *vector = SP_GRADIENT(server)->getVector(); sp_gradient_image_set_gradient ((SPGradientImage *) _gradient_preview_r[i], vector); place->add(_gradient_box_r[i]); _tooltips.set_tip(*place, __rgradient[i]); @@ -1165,7 +1165,7 @@ RotateableSwatch::RotateableSwatch(SelectedStyle *parent, guint mode) : undokey("ssrot1"), cr(0), cr_set(false) - + { } @@ -1426,14 +1426,14 @@ RotateableStrokeWidth::do_release(double by, guint modifier) { Dialog::FillAndStroke *get_fill_and_stroke_panel(SPDesktop *desktop) { - if (Dialog::PanelDialogBase *panel_dialog = + if (Dialog::PanelDialogBase *panel_dialog = dynamic_cast(desktop->_dlg_mgr->getDialog("FillAndStroke"))) { try { - Dialog::FillAndStroke &fill_and_stroke = + Dialog::FillAndStroke &fill_and_stroke = dynamic_cast(panel_dialog->getPanel()); return &fill_and_stroke; } catch (std::exception e) { } - } + } return 0; }