From 35cbd0fa2ef8b713018cd9adf996bd70d783cc1c Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Tue, 22 Jan 2019 00:46:25 +0000 Subject: Tidy memory management in toolbars --- src/ui/toolbar/select-toolbar.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/ui/toolbar/select-toolbar.cpp') 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))); -- cgit v1.2.3