[glom] Window_RelationshipsOverview: Use std::unique_ptr instead of a naked new.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Window_RelationshipsOverview: Use std::unique_ptr instead of a naked new.
- Date: Fri, 5 Feb 2016 11:20:03 +0000 (UTC)
commit 0b78d5333113053fed1b810235477c2f47e5e2f5
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Feb 5 10:42:27 2016 +0100
Window_RelationshipsOverview: Use std::unique_ptr instead of a naked new.
.../window_relationships_overview.cc | 10 ++++------
.../window_relationships_overview.h | 3 +--
2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.cc
b/glom/mode_design/relationships_overview/window_relationships_overview.cc
index b672a97..1962500 100644
--- a/glom/mode_design/relationships_overview/window_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/window_relationships_overview.cc
@@ -44,7 +44,6 @@ const bool Window_RelationshipsOverview::glade_developer(true);
Window_RelationshipsOverview::Window_RelationshipsOverview(BaseObjectType* cobject, const
Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::ApplicationWindow(cobject),
m_builder(builder),
- m_menu(nullptr),
m_modified(false),
m_scrolledwindow_canvas(nullptr)
{
@@ -83,10 +82,9 @@ Window_RelationshipsOverview::Window_RelationshipsOverview(BaseObjectType* cobje
if(!gmenu)
g_warning("GMenu not found");
- m_menu = new Gtk::MenuBar(gmenu);
-
- vbox->pack_start(*m_menu, Gtk::PACK_SHRINK);
- m_menu->show();
+ auto menu = std::make_unique<Gtk::MenuBar>(gmenu);
+ menu->show();
+ vbox->pack_start(*(Gtk::manage(menu.release())), Gtk::PACK_SHRINK);
//Get the scolled window and add the canvas to it:
@@ -465,7 +463,7 @@ void Window_RelationshipsOverview::setup_context_menu()
if(!gmenu)
g_warning("GMenu not found");
- m_context_menu = new Gtk::Menu(gmenu);
+ m_context_menu = std::make_unique<Gtk::Menu>(gmenu);
m_context_menu->attach_to_widget(*this);
}
diff --git a/glom/mode_design/relationships_overview/window_relationships_overview.h
b/glom/mode_design/relationships_overview/window_relationships_overview.h
index 2d53b93..6a98b00 100644
--- a/glom/mode_design/relationships_overview/window_relationships_overview.h
+++ b/glom/mode_design/relationships_overview/window_relationships_overview.h
@@ -80,7 +80,6 @@ private:
Glib::RefPtr<Gtk::Builder> m_builder;
Glib::RefPtr<Gio::SimpleAction> m_action_showgrid;
- Gtk::MenuBar* m_menu;
bool m_modified;
CanvasEditable m_canvas;
@@ -98,7 +97,7 @@ private:
type_list_connections m_list_table_connections;
//Context menu:
- Gtk::Menu* m_context_menu;
+ std::unique_ptr<Gtk::Menu> m_context_menu;
Glib::RefPtr<Gio::SimpleAction> m_action_edit_fields, m_action_edit_relationships;
sigc::connection m_connection_edit_fields, m_connection_edit_relationships;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]