diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-22 00:46:25 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-22 00:46:25 +0000 |
| commit | 35cbd0fa2ef8b713018cd9adf996bd70d783cc1c (patch) | |
| tree | eb6f8c2c9fe9d7a652740253e17d32588200a5b1 /src/ui/toolbar/select-toolbar.cpp | |
| parent | Tidy up toolbox code (diff) | |
| download | inkscape-35cbd0fa2ef8b713018cd9adf996bd70d783cc1c.tar.gz inkscape-35cbd0fa2ef8b713018cd9adf996bd70d783cc1c.zip | |
Tidy memory management in toolbars
Diffstat (limited to 'src/ui/toolbar/select-toolbar.cpp')
| -rw-r--r-- | src/ui/toolbar/select-toolbar.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/ui/toolbar/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp index 32ff56625..7c463601f 100644 --- a/src/ui/toolbar/select-toolbar.cpp +++ b/src/ui/toolbar/select-toolbar.cpp @@ -149,11 +149,6 @@ SelectToolbar::SelectToolbar(SPDesktop *desktop) : _update(false) {} -SelectToolbar::~SelectToolbar() -{ - delete _tracker; -} - GtkWidget * SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) { @@ -225,7 +220,7 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) TRUE, "altx", /* altx, altx_mark */ -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */ nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */ - holder->_tracker, /* unit_tracker */ + holder->_tracker.get(), /* unit_tracker */ SPIN_STEP, 3, 1); /* climb, digits, factor */ ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); @@ -244,7 +239,7 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) TRUE, "altx", /* altx, altx_mark */ -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */ nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */ - holder->_tracker, /* unit_tracker */ + holder->_tracker.get(), /* unit_tracker */ SPIN_STEP, 3, 1); /* climb, digits, factor */ ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); @@ -263,7 +258,7 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) TRUE, "altx", /* altx, altx_mark */ 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */ nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */ - holder->_tracker, /* unit_tracker */ + holder->_tracker.get(), /* unit_tracker */ SPIN_STEP, 3, 1); /* climb, digits, factor */ ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); @@ -294,7 +289,7 @@ SelectToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions) TRUE, "altx", /* altx, altx_mark */ 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, upper, step, page */ nullptr, nullptr, 0, /* descrLabels, descrValues, descrCount */ - holder->_tracker, /* unit_tracker */ + holder->_tracker.get(), /* unit_tracker */ SPIN_STEP, 3, 1); /* climb, digits, factor */ ege_adjustment_action_set_focuswidget(eact, GTK_WIDGET(desktop->canvas)); holder->_adj_h = Glib::wrap(GTK_ADJUSTMENT(ege_adjustment_action_get_adjustment(eact))); |