[gtkmm/gtkmm-2-24] ComboBoxText: Fix deprecation comment and inconsistent ifdefs.

[Kjell Ahlstedt <kjellahl src gnome org>]

commit c72e8d9af4ee4c0a725ac5d3e968dbafef0655f8
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Tue Jun 14 10:03:59 2011 +0200

    ComboBoxText: Fix deprecation comment and inconsistent ifdefs.
    
    * gtk/gtkmm/comboboxtext.h: Change comment for deprecated clear(): Use
    remove_all() instead of equally deprecated clear_items().
    * gtk/gtkmm/comboboxtext.cc: clear_items() is guarded by
    GTKMM_DISABLE_DEPRECATED, as in comboboxtext.h. Bug #650673.

 ChangeLog                 |    9 +++++++++
 gtk/gtkmm/comboboxtext.cc |    3 +--
 gtk/gtkmm/comboboxtext.h  |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4f60075..eaf5d1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-06-14  Kjell Ahlstedt  <kjell ahlstedt bredband net>
 
+	ComboBoxText: Fix deprecation comment and inconsistent ifdefs.
+
+	* gtk/gtkmm/comboboxtext.h: Change comment for deprecated clear(): Use
+	remove_all() instead of equally deprecated clear_items().
+	* gtk/gtkmm/comboboxtext.cc: clear_items() is guarded by
+	GTKMM_DISABLE_DEPRECATED, as in comboboxtext.h. Bug #650673.
+
+2011-06-14  Kjell Ahlstedt  <kjell ahlstedt bredband net>
+
 	ComboBoxText: Fix a typo.
 
 	* gtk/gtkmm/comboboxtext.cc: Replace has_model by has_entry. Bug #650673.
diff --git a/gtk/gtkmm/comboboxtext.cc b/gtk/gtkmm/comboboxtext.cc
index b2c3f89..fef30e9 100644
--- a/gtk/gtkmm/comboboxtext.cc
+++ b/gtk/gtkmm/comboboxtext.cc
@@ -22,7 +22,6 @@
 
 
 //Allow us to use deprecated GTK+ API.
-//This whole C++ class is deprecated anyway.
 #undef GTK_DISABLE_DEPRECATED
 
 #include <gtkmm/comboboxtext.h>
@@ -132,12 +131,12 @@ void ComboBoxText::clear()
 {
   remove_all();
 }
-#endif //GTKMM_DISABLE_DEPRECATED
 
 void ComboBoxText::clear_items()
 {
   remove_all();
 }
+#endif //GTKMM_DISABLE_DEPRECATED
 
 void ComboBoxText::remove_all()
 {
diff --git a/gtk/gtkmm/comboboxtext.h b/gtk/gtkmm/comboboxtext.h
index 2842ec9..7f3d413 100644
--- a/gtk/gtkmm/comboboxtext.h
+++ b/gtk/gtkmm/comboboxtext.h
@@ -119,7 +119,7 @@ public:
 
   //There is a clear() method in the CellLayout base class, so this would cause confusion.
   //TODO: Remove this when we can break API.
-  /// @deprecated See clear_items(). Since 2.8.
+  /// @deprecated Use remove_all(). Since 2.8.
   void clear();
 
   /** Remove all items from the drop-down menu.