From 88751013c436beeb04e6f3d51cc6a8c3efdf55f3 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sat, 11 Feb 2012 20:54:53 +0000
Subject: Replace old ComboText with Gtk::ComboBoxText

(bzr r10960)
---
 src/ui/widget/unit-menu.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/ui/widget/unit-menu.cpp')

diff --git a/src/ui/widget/unit-menu.cpp b/src/ui/widget/unit-menu.cpp
index 085783481..86e8c9e58 100644
--- a/src/ui/widget/unit-menu.cpp
+++ b/src/ui/widget/unit-menu.cpp
@@ -34,7 +34,11 @@ bool UnitMenu::setUnitType(UnitType unit_type)
     UnitTable::UnitMap::iterator iter = m.begin();
     while(iter != m.end()) {
         Glib::ustring text = (*iter).first;
+#if WITH_GTKMM_2_24
+        append(text);
+#else
         append_text(text);
+#endif
         ++iter;
     }
     _type = unit_type;
@@ -45,7 +49,11 @@ bool UnitMenu::setUnitType(UnitType unit_type)
 
 bool UnitMenu::resetUnitType(UnitType unit_type) 
 {
-    clear_text();
+#if WITH_GTKMM_2_24
+	remove_all();
+#else
+	clear_items();
+#endif
 
     return setUnitType(unit_type);
 }
@@ -53,7 +61,11 @@ bool UnitMenu::resetUnitType(UnitType unit_type)
 void UnitMenu::addUnit(Unit const& u)
 {
     _unit_table.addUnit(u, false);
+#if WITH_GTKMM_2_24
+    append(u.abbr);
+#else
     append_text(u.abbr);
+#endif
 }
 
 Unit UnitMenu::getUnit() const
-- 
cgit v1.2.3