[glom/maemo5] Maemo: Adapt for latest hildonmm changes.

[Murray Cumming <murrayc src gnome org>]

commit 2ddc15e443b01b009b1a6879aec64ac5461ad4ea
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 19 11:40:29 2009 +0200

    Maemo: Adapt for latest hildonmm changes.
    
    * glom/utility_widgets/comboentryglom.cc:
    * glom/utility_widgets/comboglom.cc: get/set_active() changed to
    set_selected() and we now have an iter-base get/set_selected() for the
    PickerButton so we don't need to get the TouchSelector.

 ChangeLog                              |    9 +++++++++
 glom/utility_widgets/comboentryglom.cc |    6 ++----
 glom/utility_widgets/comboglom.cc      |   16 ++++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 703da6f..a9eff5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-19  Murray Cumming  <murrayc murrayc com>
+
+	Maemo: Adapt for latest hildonmm changes.
+	
+	* glom/utility_widgets/comboentryglom.cc:
+	* glom/utility_widgets/comboglom.cc: get/set_active() changed to 
+	set_selected() and we now have an iter-base get/set_selected() for the 
+	PickerButton so we don't need to get the TouchSelector. 
+
 2009-10-16  Murray Cumming  <murrayc murrayc com>
 
   Maemo: Fix the build for the latest hildonmm.
diff --git a/glom/utility_widgets/comboentryglom.cc b/glom/utility_widgets/comboentryglom.cc
index 0ba4f4e..99d2d53 100644
--- a/glom/utility_widgets/comboentryglom.cc
+++ b/glom/utility_widgets/comboentryglom.cc
@@ -258,7 +258,7 @@ void ComboEntryGlom::set_text(const Glib::ustring& text)
 
     if(this_text == text)
     {
-      m_maemo_selector.set_selected(0, iter);
+      set_selected(iter);
     }
   }
   #endif //GLOM_ENABLE_MAEMO
@@ -334,9 +334,7 @@ void ComboEntryGlom::on_changed(int /* column */)
   #ifndef GLOM_ENABLE_MAEMO
   Gtk::TreeModel::iterator iter = get_active();
   #else
-   //TODO: See bug https://bugs.maemo.org/show_bug.cgi?id=4640
-  //about the get_selected()/get_active() confusion.
-  Gtk::TreeModel::iterator iter = m_maemo_selector.get_selected(0);
+  Gtk::TreeModel::iterator iter = get_selected();
   #endif //GLOM_ENABLE_MAEMO
   
   if(iter)
diff --git a/glom/utility_widgets/comboglom.cc b/glom/utility_widgets/comboglom.cc
index 810cb7b..4270d50 100644
--- a/glom/utility_widgets/comboglom.cc
+++ b/glom/utility_widgets/comboglom.cc
@@ -163,7 +163,11 @@ void ComboGlom::set_text(const Glib::ustring& text)
 
     if(this_text == text)
     {
+      #ifndef GLOM_ENABLE_MAEMO
       set_active(iter);
+      #else
+      set_selected(iter);
+      #endif //GLOM_ENABLE_MAEMO
       return; //success
     }
   }
@@ -174,7 +178,7 @@ void ComboGlom::set_text(const Glib::ustring& text)
   #ifndef GLOM_ENABLE_MAEMO
   unset_active();
   #else
-  m_maemo_selector.unselect_all(0);
+  unselect();
   #endif
 }
 
@@ -193,10 +197,8 @@ Glib::ustring ComboGlom::get_text() const
   #ifndef GLOM_ENABLE_MAEMO
   Gtk::TreeModel::iterator iter = get_active();
   #else
-  //TODO: See bug https://bugs.maemo.org/show_bug.cgi?id=4640
-  //about the get_selected()/get_active() confusion.
-  Hildon::TouchSelector& unconst = const_cast<Hildon::TouchSelector&>(m_maemo_selector);
-  Gtk::TreeModel::iterator iter = unconst.get_selected(0);
+  ComboGlom* unconst = const_cast<ComboGlom*>(this);
+  Gtk::TreeModel::iterator iter = unconst->get_selected();
   #endif //GLOM_ENABLE_MAEMO
   
   if(iter)
@@ -270,9 +272,7 @@ void ComboGlom::on_changed(int /* column */)
   #ifndef GLOM_ENABLE_MAEMO
   Gtk::TreeModel::iterator iter = get_active();
   #else
-   //TODO: See bug https://bugs.maemo.org/show_bug.cgi?id=4640
-  //about the get_selected()/get_active() confusion.
-  Gtk::TreeModel::iterator iter = m_maemo_selector.get_selected(0);
+  Gtk::TreeModel::iterator iter = get_selected();
   #endif //GLOM_ENABLE_MAEMO
   
   if(iter)