[glom/feature_backup2] Fixed warnings with latest gtkmm-2.24
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/feature_backup2] Fixed warnings with latest gtkmm-2.24
- Date: Wed, 21 Jul 2010 09:08:01 +0000 (UTC)
commit 9019f1bf5f9330d5da192b1b16424e1b53057194
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Jul 20 13:36:27 2010 +0200
Fixed warnings with latest gtkmm-2.24
* glom/mode_data/notebook_data.cc:
* glom/mode_find/notebook_find.cc: Use Gtk::Notebook::append_page()
instead of Gtk::Notebook::pages().push_back().
ChangeLog | 10 +++++++++-
glom/mode_data/notebook_data.cc | 4 ++--
glom/mode_find/notebook_find.cc | 14 +++++++-------
3 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1677ff8..889e8ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2010-07-13 Murray Cumming <murrayc murrayc-desktop>
+2010-07-20 Murray Cumming <murrayc murrayc com>>
+
+ Fixed warnings with latest gtkmm-2.24
+
+ * glom/mode_data/notebook_data.cc:
+ * glom/mode_find/notebook_find.cc: Use Gtk::Notebook::append_page()
+ instead of Gtk::Notebook::pages().push_back().
+
+2010-07-13 Murray Cumming <murrayc murrayc com>
Fixed warnings, even with the latest gtkmm-2.24.
diff --git a/glom/mode_data/notebook_data.cc b/glom/mode_data/notebook_data.cc
index 6ab4c67..1c30132 100644
--- a/glom/mode_data/notebook_data.cc
+++ b/glom/mode_data/notebook_data.cc
@@ -37,11 +37,11 @@ Notebook_Data::Notebook_Data()
m_iPage_Details(0), m_iPage_List(0)
{
//Add Pages:
- pages().push_back(Gtk::Notebook_Helpers::TabElem(m_Box_List, _("List")));
+ append_page(m_Box_List, _("List"));
m_iPage_List = 0;
#ifndef GLOM_ENABLE_MAEMO
- pages().push_back(Gtk::Notebook_Helpers::TabElem(m_Box_Details, _("Details")));
+ append_page(m_Box_Details, _("Details"));
m_iPage_Details = 1;
#else
//On Maemo, we add the box to m_window_maemo_details instead:
diff --git a/glom/mode_find/notebook_find.cc b/glom/mode_find/notebook_find.cc
index 605c740..b108239 100644
--- a/glom/mode_find/notebook_find.cc
+++ b/glom/mode_find/notebook_find.cc
@@ -29,16 +29,16 @@ Notebook_Find::Notebook_Find()
m_iPage_List(0)
{
#ifndef GLOM_ENABLE_MAEMO
- pages().push_back(Gtk::Notebook_Helpers::TabElem(m_Box_List, _("List")));
+ append_page(m_Box_List, _("List"));
m_Box_List.signal_find_criteria.connect(sigc::mem_fun(*this, &Notebook_Find::on_page_find_criteria));
m_iPage_List = 0;
m_iPage_Details = 1;
-
+
//Fill composite view:
add_view(&m_Box_List);
#endif //GLOM_ENABLE_MAEMO
- pages().push_back(Gtk::Notebook_Helpers::TabElem(m_Box_Details, _("Details")));
+ append_page(m_Box_Details, _("Details"));
set_current_page(m_iPage_Details); //Show the details page by default. It's more obvious for a Find.
//TODO: Show the same layout that is being edited at the time that the mode was changed.
@@ -49,7 +49,7 @@ Notebook_Find::Notebook_Find()
add_view(&m_Box_Details);
show_all_children();
-
+
#ifdef GLOM_ENABLE_MAEMO
set_show_tabs(false);
#endif //GLOM_ENABLE_MAEMO
@@ -60,18 +60,18 @@ Notebook_Find::~Notebook_Find()
#ifndef GLOM_ENABLE_MAEMO
remove_view(&m_Box_List);
#endif
-
+
remove_view(&m_Box_Details);
}
bool Notebook_Find::init_db_details(const Glib::ustring& table_name, const Glib::ustring& layout_platform)
{
bool result = true;
-
+
#ifndef GLOM_ENABLE_MAEMO
result = m_Box_List.init_db_details(table_name, layout_platform);
#endif
-
+
m_Box_Details.init_db_details(table_name, layout_platform);
return result;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]