diff options
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/object-composite-settings.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/page-sizer.cpp | 7 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 6 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 161f5ba4f..3677233bc 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -48,8 +48,6 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co _filter_modifier.signal_blur_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_blendBlurValueChanged)); _filter_modifier.signal_opacity_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged)); - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - show_all_children(); } diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index c9b3664fc..805333f8e 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -22,15 +22,10 @@ #endif #include "page-sizer.h" - #include <glibmm/i18n.h> - #include "verbs.h" - #include "helper/action.h" - #include "object/sp-root.h" - #include "ui/widget/button.h" using std::pair; @@ -922,7 +917,7 @@ PageSizer::on_margin_lock_changed() double left = _marginLeft.getValue(); double right = _marginRight.getValue(); double top = _marginTop.getValue(); - double bottom = _marginBottom.getValue(); + //double bottom = _marginBottom.getValue(); if (Geom::are_near(left,right)) { if (Geom::are_near(left, top)) { on_margin_changed(&_marginBottom); diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 3988ca544..a15afde4c 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -121,6 +121,8 @@ SelectedStyle::SelectedStyle(bool /*layout*/) : current_stroke_width(0), + _sw_unit(NULL), + _desktop (NULL), _table(), _fill_label (_("Fill:")), @@ -141,9 +143,7 @@ SelectedStyle::SelectedStyle(bool /*layout*/) _stroke_width_place(this), _stroke_width (""), - _opacity_blocked (false), - - _sw_unit(NULL) + _opacity_blocked (false) { set_name("SelectedStyle"); _drop[0] = _drop[1] = 0; |
