[gtkmm] Remove more deprecated API

From: Kjell Ahlstedt <kjellahl src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtkmm] Remove more deprecated API
Date: Mon, 7 Nov 2016 09:29:38 +0000 (UTC)
commit 247aaa4f127e111832fc054b407a0916caae0133
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Mon Nov 7 10:22:04 2016 +0100

    Remove more deprecated API
    
    and undeprecate some Gtk::Settings that are no longer deprecated in gtk+.
    This removed API is not directly related to removed API in gtk+.
    Bug #773642

 gdk/src/display.hg            |    4 +-
 gtk/src/applicationwindow.ccg |   22 ---------
 gtk/src/applicationwindow.hg  |   37 --------------
 gtk/src/button.hg             |    2 +-
 gtk/src/combobox.hg           |    1 -
 gtk/src/dialog.hg             |    6 +--
 gtk/src/menubutton.ccg        |   19 -------
 gtk/src/menubutton.hg         |   39 ---------------
 gtk/src/papersize.ccg         |    7 ---
 gtk/src/papersize.hg          |   22 ---------
 gtk/src/scrolledwindow.ccg    |    9 ----
 gtk/src/scrolledwindow.hg     |   18 -------
 gtk/src/settings.hg           |    8 ++--
 gtk/src/stack.hg              |    1 -
 gtk/src/stylecontext.hg       |    1 -
 gtk/src/treeiter.ccg          |   17 -------
 gtk/src/treeiter.hg           |  104 +----------------------------------------
 gtk/src/treemodel.hg          |   14 ------
 gtk/src/treepath.ccg          |    7 ---
 gtk/src/treepath.hg           |   22 ---------
 gtk/src/treerowreference.ccg  |    7 ---
 gtk/src/treerowreference.hg   |   21 --------
 gtk/src/treeviewcolumn.hg     |   12 -----
 23 files changed, 10 insertions(+), 390 deletions(-)
---
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index d0c769f..666adb3 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -74,8 +74,8 @@ public:
   _WRAP_METHOD(void put_event(GdkEvent* event), gdk_display_put_event)
   _WRAP_METHOD(bool has_pending() const, gdk_display_has_pending)
 
-  _WRAP_METHOD(void set_double_click_time(guint msec), gdk_display_set_double_click_time, deprecated "No 
replacement method. Applications should not set this.")
-  _WRAP_METHOD(void set_double_click_distance(guint distance), gdk_display_set_double_click_distance, 
deprecated "No replacement method. Applications should not set this.")
+  // Applications should not set these, they are global user-configured settings.
+  _IGNORE(gdk_display_set_double_click_time, gdk_display_set_double_click_distance)
 
   _WRAP_METHOD(static Glib::RefPtr<Display> get_default(), gdk_display_get_default, refreturn)
 
diff --git a/gtk/src/applicationwindow.ccg b/gtk/src/applicationwindow.ccg
index f48337f..1c26d23 100644
--- a/gtk/src/applicationwindow.ccg
+++ b/gtk/src/applicationwindow.ccg
@@ -51,26 +51,4 @@ void ApplicationWindow::unset_help_overlay()
   gtk_application_window_set_help_overlay(gobj(), nullptr);
 }
 
-_DEPRECATE_IFDEF_START
-GtkApplicationWindow* ApplicationWindow::gobj_copy()
-{
-  reference();
-  return gobj();
-}
-_DEPRECATE_IFDEF_END
-
 } // namespace Gtk
-
-_DEPRECATE_IFDEF_START
-namespace Glib
-{
-//TODO: This wrap() function is broken. Remove it at the next ABI-break.
-Glib::RefPtr<Gtk::ApplicationWindow> wrap(GtkApplicationWindow* object, bool take_copy)
-{
-  g_warning("Glib::wrap(GtkApplicationWindow*, bool) is broken. See the reference documentation.\n");
-  return 
Glib::RefPtr<Gtk::ApplicationWindow>(dynamic_cast<Gtk::ApplicationWindow*>(Glib::wrap_auto((GObject*)(object),
 take_copy)));
-  //We use dynamic_cast<> in case of multiple inheritance.
-}
-
-} /* namespace Glib */
-_DEPRECATE_IFDEF_END
diff --git a/gtk/src/applicationwindow.hg b/gtk/src/applicationwindow.hg
index affa3d0..8e2bdb9 100644
--- a/gtk/src/applicationwindow.hg
+++ b/gtk/src/applicationwindow.hg
@@ -73,13 +73,10 @@ class ApplicationWindow
   public Gio::ActionGroup,
   public Gio::ActionMap
 {
-  //TODO: At the next ABI-break, remove _NO_WRAP_FUNCTION, and the hand-coded gobj_copy() and wrap().
-  // https://bugzilla.gnome.org/show_bug.cgi?id=767951
   _CLASS_GTKOBJECT(ApplicationWindow, GtkApplicationWindow, GTK_APPLICATION_WINDOW, Gtk::Window, GtkWindow)
   _IMPLEMENTS_INTERFACE(Gio::ActionGroup)
   _IMPLEMENTS_INTERFACE(Gio::ActionMap)
   _UNMANAGEABLE
-  _NO_WRAP_FUNCTION
 public:
   _CTOR_DEFAULT
   explicit ApplicationWindow(const Glib::RefPtr<Application>& application);
@@ -87,14 +84,6 @@ dnl // Don't ignore gtk_application_window_new(). h2def.py erroneously classifie
 dnl // it as a GtkApplication method, because its first parameter is a GtkApplication*.
 dnl //_IGNORE(gtk_application_window_new)
 
-_DEPRECATE_IFDEF_START
-  /** Provides access to the underlying C instance.
-   * The caller is responsible for unrefing it. Use when directly setting fields in structs.
-   * @deprecated This method should never have been created.
-   */
-  GtkApplicationWindow* gobj_copy();
-_DEPRECATE_IFDEF_END
-
   _WRAP_METHOD(void set_show_menubar(bool show_menubar = true), gtk_application_window_set_show_menubar)
   _WRAP_METHOD(bool get_show_menubar() const, gtk_application_window_get_show_menubar)
 
@@ -112,29 +101,3 @@ _DEPRECATE_IFDEF_END
 };
 
 } // namespace Gtk
-
-_DEPRECATE_IFDEF_START
-namespace Glib
-{
-  /** A Glib::wrap() method for this object.
-   *
-   * @note
-   * This wrap() function is broken. It will be fixed at the next ABI-break.
-   * It should return a Gtk::ApplicationWindow*. A workaround:
-   * @code
-   * GtkApplicationWindow* gtkappwin = some_func();
-   * Gtk::ApplicationWindow* appwinmm =
-   *   dynamic_cast<Gtk::ApplicationWindow*>(Glib::wrap((GtkWindow*)gtkappwin, take_copy));
-   * @endcode
-   *
-   * @deprecated Use the workaround instead.
-   *
-   * @param object The C instance.
-   * @param take_copy False if the result should take ownership of the C instance. True if it should take a 
new copy or ref.
-   * @result A C++ instance that wraps this C instance.
-   *
-   * @relates Gtk::ApplicationWindow
-   */
-  Glib::RefPtr<Gtk::ApplicationWindow> wrap(GtkApplicationWindow* object, bool take_copy = false);
-}
-_DEPRECATE_IFDEF_END
diff --git a/gtk/src/button.hg b/gtk/src/button.hg
index 99db855..331ccff 100644
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@ -80,7 +80,7 @@ public:
   _WRAP_METHOD(Glib::ustring get_icon_name() const, gtk_button_get_icon_name)
 
   _WRAP_SIGNAL(void clicked(), "clicked")
-  _WRAP_SIGNAL(void activate(), "activate", deprecated "Use signal_clicked() instead.")
+  _IGNORE_SIGNAL("activate") // Action signal
 
   _WRAP_PROPERTY("label", Glib::ustring)
   _WRAP_PROPERTY("relief", ReliefStyle)
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 5d62c03..6415fc9 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -177,7 +177,6 @@ public:
   _WRAP_METHOD(int get_id_column() const, gtk_combo_box_get_id_column)
   _WRAP_METHOD(void set_id_column(int id_column), gtk_combo_box_set_id_column)
   _WRAP_METHOD(Glib::ustring get_active_id() const, gtk_combo_box_get_active_id)
-  _WRAP_METHOD(void get_active_id(const Glib::ustring& active_id), gtk_combo_box_set_active_id, deprecated 
"Use set_active_id(). This method was incorrectly named.")
 
   /** Changes the active row of the combo box to the one that has an ID equal to
    * @a active_id.
diff --git a/gtk/src/dialog.hg b/gtk/src/dialog.hg
index 15f8fee..d73668d 100644
--- a/gtk/src/dialog.hg
+++ b/gtk/src/dialog.hg
@@ -143,9 +143,6 @@ public:
   _WRAP_METHOD(ButtonBox* get_action_area(), gtk_dialog_get_action_area, deprecated "Direct access to the 
action area is discouraged. Use add_button(), etc.")
   _WRAP_METHOD(const ButtonBox* get_action_area() const, gtk_dialog_get_action_area, constversion, 
deprecated "Direct access to the action area is discouraged. Use add_button(), etc.")
 
-  _WRAP_METHOD(Box* get_vbox(), gtk_dialog_get_content_area, deprecated "Use get_content_area() instead.")
-  _WRAP_METHOD(const Box* get_vbox() const, gtk_dialog_get_content_area, constversion, deprecated "Use 
get_content_area() instead.")
-
   _WRAP_METHOD(Box* get_content_area(), gtk_dialog_get_content_area)
   _WRAP_METHOD(const Box* get_content_area() const, gtk_dialog_get_content_area, constversion)
 
@@ -154,10 +151,9 @@ public:
 
   _WRAP_SIGNAL(void response(int response_id), "response")
 
-  //_WRAP_PROPERTY("has-separator", bool) //deprecated.
   _WRAP_PROPERTY("use-header-bar", bool)
 
-  _IGNORE_SIGNAL("close")
+  _IGNORE_SIGNAL("close") // Keybinding signal
 };
 
 } //namespace Gtk
diff --git a/gtk/src/menubutton.ccg b/gtk/src/menubutton.ccg
index b308539..cde0b92 100644
--- a/gtk/src/menubutton.ccg
+++ b/gtk/src/menubutton.ccg
@@ -20,13 +20,6 @@
 namespace Gtk
 {
 
-_DEPRECATE_IFDEF_START
-void MenuButton::unset_menu()
-{
-  gtk_menu_button_set_popup(gobj(), nullptr);
-}
-_DEPRECATE_IFDEF_END
-
 void MenuButton::unset_popup()
 {
   gtk_menu_button_set_popup(gobj(), nullptr);
@@ -42,16 +35,4 @@ void MenuButton::unset_menu_model()
   gtk_menu_button_set_menu_model(gobj(), nullptr);
 }
 
-#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::PropertyProxy< Menu* > MenuButton::property_menu()
-{
-  return property_popup();
-}
-
-Glib::PropertyProxy_ReadOnly< Menu* > MenuButton::property_menu() const
-{
-  return property_popup();
-}
-#endif // GTKMM_DISABLE_DEPRECATED
-
 } //namespace Gtk
diff --git a/gtk/src/menubutton.hg b/gtk/src/menubutton.hg
index 6b60342..825da40 100644
--- a/gtk/src/menubutton.hg
+++ b/gtk/src/menubutton.hg
@@ -43,22 +43,6 @@ public:
 
   _CTOR_DEFAULT
 
-
-  _WRAP_METHOD(void set_menu(Menu& menu), gtk_menu_button_set_popup, deprecated "Use set_popup() instead.")
-
-_DEPRECATE_IFDEF_START
-  /** Disables the button.
-   *
-   * @deprecated Use unset_popup() instead.
-   */
-  void unset_menu();
-_DEPRECATE_IFDEF_END
-
-  _WRAP_METHOD(Menu* get_menu(), gtk_menu_button_get_popup, deprecated "Use get_popup() instead.")
-  _WRAP_METHOD(const Menu* get_menu() const, gtk_menu_button_get_popup, constversion, deprecated "Use 
get_popup() instead.")
-
-  _WRAP_METHOD(void set_popup(Menu& menu), gtk_menu_button_set_popup)
-
   /** Disables the button.
    */
   void unset_popup();
@@ -90,33 +74,10 @@ _DEPRECATE_IFDEF_END
   _WRAP_METHOD(Glib::RefPtr<Gio::MenuModel> get_menu_model(), gtk_menu_button_get_menu_model, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gio::MenuModel> get_menu_model() const, gtk_menu_button_get_menu_model, 
refreturn, constversion)
 
-
   _WRAP_METHOD(void set_align_widget(Widget& align_widget), gtk_menu_button_set_align_widget)
   _WRAP_METHOD(Widget* get_align_widget(), gtk_menu_button_get_align_widget)
   _WRAP_METHOD(const Widget* get_align_widget() const, gtk_menu_button_get_align_widget)
 
-#ifndef GTKMM_DISABLE_DEPRECATED
-// _WRAP_PROPERTY("menu", Menu*, deprecated "Use popup instead.")
-// The GtkMenuButton::menu property does not exist in gtk+ 3.7.0 and later. Must hand-code to avoid an 
API/ABI break.
-/** The dropdown menu.
-   * @deprecated Use popup instead.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the value of the property,
-   * or receive notification when the value of the property changes.
-   */
-  Glib::PropertyProxy< Menu* > property_menu() ;
-
-/** The dropdown menu.
-   * @deprecated Use popup instead.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy_ReadOnly that allows you to get the value of the property,
-   * or receive notification when the value of the property changes.
-   */
-  Glib::PropertyProxy_ReadOnly< Menu* > property_menu() const;
-#endif // GTKMM_DISABLE_DEPRECATED
-
   _WRAP_PROPERTY("popup", Menu*)
   _WRAP_PROPERTY("menu-model", Glib::RefPtr<Gio::MenuModel>)
   _WRAP_PROPERTY("align-widget", Widget*)
diff --git a/gtk/src/papersize.ccg b/gtk/src/papersize.ccg
index 0bc106b..9cd04fd 100644
--- a/gtk/src/papersize.ccg
+++ b/gtk/src/papersize.ccg
@@ -70,13 +70,6 @@ bool PaperSize::equal(const PaperSize& other) const
                                                     const_cast<GtkPaperSize*>(other.gobj()))));
 }
 
-_DEPRECATE_IFDEF_START
-PaperSize::operator const void*() const
-{
-  return gobj() ? GINT_TO_POINTER(1) : nullptr;
-}
-_DEPRECATE_IFDEF_END
-
 PaperSize::operator bool() const
 {
   return gobj();
diff --git a/gtk/src/papersize.hg b/gtk/src/papersize.hg
index 01e9947..db20a95 100644
--- a/gtk/src/papersize.hg
+++ b/gtk/src/papersize.hg
@@ -68,28 +68,6 @@ public:
   _IGNORE(gtk_paper_size_copy, gtk_paper_size_free, gtk_paper_size_is_equal)
   bool equal(const PaperSize& other) const;
 
-_DEPRECATE_IFDEF_START
-  /** This typedef is just to make it more obvious that
-   * our operator const void* should be used like operator bool().
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  typedef const void* BoolExpr;
-
-  /** Returns true if the PaperSize is a valid object.
-   * For instance,
-   * @code
-   * if(papersize)
-   *   do_something()
-   * @endcode
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   *
-   * @newin{2,12}
-   */
-  operator BoolExpr() const;
-_DEPRECATE_IFDEF_END
-
    /** Returns true if the PaperSize is a valid object.
     * For instance,
     * @code
diff --git a/gtk/src/scrolledwindow.ccg b/gtk/src/scrolledwindow.ccg
index 53fec4a..f1f05ef 100644
--- a/gtk/src/scrolledwindow.ccg
+++ b/gtk/src/scrolledwindow.ccg
@@ -31,13 +31,4 @@ void ScrolledWindow::add(Gtk::Widget& widget)
   Bin::add(widget);
 }
 
-_DEPRECATE_IFDEF_START
-void ScrolledWindow::remove_with_viewport()
-{
-  //We used to do what GTK+ now does for us:
-  //See https://bugzilla.gnome.org/show_bug.cgi?id=710471
-  remove();
-}
-_DEPRECATE_IFDEF_END
-
 } //namespace Gtk
diff --git a/gtk/src/scrolledwindow.hg b/gtk/src/scrolledwindow.hg
index c43fdc2..6b79135 100644
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@ -76,24 +76,6 @@ public:
   ///Puts the child inside a Gtk::Viewport if it doesn't have native scrolling capability.
   void add(Gtk::Widget& widget) override;
 
-_DEPRECATE_IFDEF_START
-  /** Removes the contained widget, possibly also a Gtk::Viewport.
-   * Since this can only hold one widget it is not necessary to specify which
-   * widget to remove, like containers that don't derive from Gtk::Bin.
-   *
-   * This method is useful if you have added a widget without native scrolling
-   * capability, and ScrolledWindow::add() has created a Gtk::Viewport.
-   *
-   * If the child of the ScrolledWindow is a Gtk::Viewport that was created by add(),
-   * remove_with_viewport() removes the Viewport's child from the Viewport,
-   * and removes the Viewport from the ScrolledWindow. The Viewport is destroyed.
-   *
-   * @newin{3,8}
-   * @deprecated Use Bin::remove() instead. It's now identical to remove_with_viewport().
-   */
-  void remove_with_viewport();
-_DEPRECATE_IFDEF_END
-
 #m4 _CONVERSION(`GtkWidget*',`Scrollbar*',`Glib::wrap((GtkScrollbar*)$3)')
 #m4 _CONVERSION(`GtkWidget*',`const Scrollbar*',`Glib::wrap((GtkScrollbar*)$3)')
   _WRAP_METHOD(Scrollbar* get_vscrollbar(), gtk_scrolled_window_get_vscrollbar)
diff --git a/gtk/src/settings.hg b/gtk/src/settings.hg
index 1a5ec98..a9896b5 100644
--- a/gtk/src/settings.hg
+++ b/gtk/src/settings.hg
@@ -45,9 +45,9 @@ public:
 
   _WRAP_PROPERTY("gtk-double-click-time", int)
   _WRAP_PROPERTY("gtk-double-click-distance", int)
-  _WRAP_PROPERTY("gtk-cursor-blink", bool, deprecated "This setting is ignored.")
-  _WRAP_PROPERTY("gtk-cursor-blink-time", int, deprecated "This setting is ignored.")
-  _WRAP_PROPERTY("gtk-cursor-blink-timeout", int, deprecated "This setting is ignored.") //since 3.4
+  _WRAP_PROPERTY("gtk-cursor-blink", bool)
+  _WRAP_PROPERTY("gtk-cursor-blink-time", int)
+  _WRAP_PROPERTY("gtk-cursor-blink-timeout", int) //since 3.4
   _WRAP_PROPERTY("gtk-split-cursor", bool)
   _WRAP_PROPERTY("gtk-theme-name", Glib::ustring)
   _WRAP_PROPERTY("gtk-key-theme-name", Glib::ustring)
@@ -83,7 +83,7 @@ public:
   _WRAP_PROPERTY("gtk-enable-primary-paste", bool) //since 3.6
 
   _WRAP_PROPERTY("gtk-label-select-on-focus", bool) //since 3.4
-  _WRAP_PROPERTY("gtk-entry-password-hint-timeout", guint, deprecated "This setting is ignored.") //since 3.4
+  _WRAP_PROPERTY("gtk-entry-password-hint-timeout", guint) //since 3.4
   //TODO: Add others added since?
 
   _WRAP_PROPERTY("gtk-entry-select-on-focus", bool)
diff --git a/gtk/src/stack.hg b/gtk/src/stack.hg
index 220e279..21e2e25 100644
--- a/gtk/src/stack.hg
+++ b/gtk/src/stack.hg
@@ -81,7 +81,6 @@ public:
   _WRAP_METHOD(guint get_transition_duration() const, gtk_stack_get_transition_duration)
 
   _WRAP_METHOD(void set_transition_type(StackTransitionType transition), gtk_stack_set_transition_type)
-  _WRAP_METHOD(StackTransitionType get_transition_type(), gtk_stack_get_transition_type, deprecated "Use the 
const method instead.")
   _WRAP_METHOD(StackTransitionType get_transition_type() const, gtk_stack_get_transition_type)
 
   _WRAP_METHOD(bool get_transition_running() const, gtk_stack_get_transition_running)
diff --git a/gtk/src/stylecontext.hg b/gtk/src/stylecontext.hg
index 7a8d322..6e71c2c 100644
--- a/gtk/src/stylecontext.hg
+++ b/gtk/src/stylecontext.hg
@@ -220,7 +220,6 @@ _DEPRECATE_IFDEF_END
   _WRAP_METHOD(void render_frame(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x,  double y, double 
width, double height), gtk_render_frame)
   _WRAP_METHOD(void render_expander(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, double 
width, double height), gtk_render_expander)
   _WRAP_METHOD(void render_focus(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, double 
width, double height), gtk_render_focus)
-  _WRAP_METHOD(void render_layout(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, 
PangoLayout* layout), gtk_render_layout, deprecated "Use the render_layout() taking a const 
Glib::RefPtr<Pango::Layout>& layout.")
   _WRAP_METHOD(void render_layout(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, const 
Glib::RefPtr<Pango::Layout>& layout), gtk_render_layout)
   _WRAP_METHOD(void render_line(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x0, double y0,  double 
x1, double y1), gtk_render_line)
   _WRAP_METHOD(void render_slider(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, double 
width, double height,  Orientation orientation), gtk_render_slider)
diff --git a/gtk/src/treeiter.ccg b/gtk/src/treeiter.ccg
index c808e75..d7d7e6a 100644
--- a/gtk/src/treeiter.ccg
+++ b/gtk/src/treeiter.ccg
@@ -134,16 +134,6 @@ bool TreeIter::equal(const TreeIter& other) const
          (gobject_.user_data3 == other.gobject_.user_data3);
 }
 
-_DEPRECATE_IFDEF_START
-TreeIter::operator const void*() const
-{
-  // Test whether the GtkTreeIter is valid and not an end iterator.  This check
-  // is almost the same as the private VALID_ITER() macro in gtkliststore.c and
-  // gtktreestore.c.
-  return (!is_end_ && gobject_.stamp) ? GINT_TO_POINTER(1) : nullptr;
-}
-_DEPRECATE_IFDEF_END
-
 TreeIter::operator bool() const
 {
   // Test whether the GtkTreeIter is valid and not an end iterator.  This check
@@ -222,13 +212,6 @@ void TreeRow::get_value_impl(int column, Glib::ValueBase& value) const
   model_->get_value_impl(*this, column, value);
 }
 
-_DEPRECATE_IFDEF_START
-TreeRow::operator const void*() const
-{
-  return TreeIter::operator const void*();
-}
-_DEPRECATE_IFDEF_END
-
 TreeRow::operator bool() const
 {
   return TreeIter::operator bool();
diff --git a/gtk/src/treeiter.hg b/gtk/src/treeiter.hg
index c1ebf26..bb0c002 100644
--- a/gtk/src/treeiter.hg
+++ b/gtk/src/treeiter.hg
@@ -119,26 +119,6 @@ public:
 
   bool equal(const TreeIter& other) const;
 
-_DEPRECATE_IFDEF_START
-  /** This typedef is just to make it more obvious that
-   * our operator const void* should be used like operator bool().
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  typedef const void* BoolExpr;
-
-  /** Discover whether the iterator is valid, and not equal to end().
-   * For instance,
-   * @code
-   * if(treeiter)
-   *   do_something()
-   * @endcode
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  operator BoolExpr() const;
-_DEPRECATE_IFDEF_END
-
   /** Discover whether the iterator is valid, and not equal to end().
    * For instance,
    * @code
@@ -314,30 +294,10 @@ public:
    */
   TreeIter parent() const;
 
-_DEPRECATE_IFDEF_START
-  /** This typedef is just to make it more obvious that
-   * our operator const void* should be used like operator bool().
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  typedef const void* BoolExpr;
-
-  /** Discover whether this is a valid row.
-   * For instance,
-   * @code
-   * if(treeiter)
-   *   do_something()
-   * @endcode
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  operator BoolExpr() const;
-_DEPRECATE_IFDEF_END
-
   /** Discover whether this is a valid row.
    * For instance,
    * @code
-   * if(treeiter)
+   * if(treerow)
    *   do_something()
    * @endcode
    *
@@ -373,70 +333,16 @@ public:
   typedef Gtk::TreeIter iterator;
   typedef Gtk::TreeIter const_iterator; //TODO: Make it a real const_iterator.
 
-  // Reverse iterator: https://bugzilla.gnome.org/show_bug.cgi?id=554889
-_DEPRECATE_IFDEF_START
-  #ifndef GLIBMM_HAVE_SUN_REVERSE_ITERATOR
-    /** @deprecated This reverse_iterator has never worked,
-     * use the normal (forward) iterator instead.
-     */
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-  #else
-    /** @deprecated This reverse_iterator has never worked,
-     * use the normal (forward) iterator instead.
-     */
-    typedef std::reverse_iterator<iterator, std::random_access_iterator_tag,
-                                  int, int&, int*, std::ptrdiff_t> reverse_iterator;
-  #endif
-
-  #ifndef GLIBMM_HAVE_SUN_REVERSE_ITERATOR
-    /** @deprecated This reverse_iterator has never worked,
-     * use the normal (forward) iterator instead.
-     */
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-  #else
-    /** @deprecated This reverse_iterator has never worked,
-     * use the normal (forward) iterator instead.
-     */
-    typedef std::reverse_iterator<const_iterator, std::random_access_iterator_tag,
-                                  int, const int&, const int*, std::ptrdiff_t> const_reverse_iterator;
-  #endif
-_DEPRECATE_IFDEF_END
-
   iterator begin();
   const_iterator begin() const;
   iterator end();
   const_iterator end()   const;
 
-_DEPRECATE_IFDEF_START
-  // Note: there is no advantage in not inlining these methods.
-  // We can't change them without breaking ABI anyway.
-  /** @deprecated Use begin() or end() instead.
-   */
-  reverse_iterator       rbegin()       { return reverse_iterator(end());         }
-  /** @deprecated Use begin() or end() instead.
-   */
-  reverse_iterator       rend()         { return reverse_iterator(begin());       }
-  /** @deprecated Use begin() or end() instead.
-   */
-  const_reverse_iterator rbegin() const { return const_reverse_iterator(end());   }
-  /** @deprecated Use begin() or end() instead.
-   */
-  const_reverse_iterator rend()   const { return const_reverse_iterator(begin()); }
-_DEPRECATE_IFDEF_END
-
   value_type operator[](size_type index) const;
 
   size_type size() const;
   bool empty() const;
 
-_DEPRECATE_IFDEF_START
-  /** This typedef is just to make it more obvious that
-   * our operator const void* should be used like operator bool().
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  typedef const void* BoolExpr;
-
   /** Discover whether this is a valid TreeNodeChildren.
    * For instance,
    * @code
@@ -444,14 +350,8 @@ _DEPRECATE_IFDEF_START
    *   do_something()
    * @endcode
    *
-   * @deprecated Use the explicit operator bool() instead.
+   * @newin{3,22}
    */
-  operator BoolExpr() const
-  {
-    return !empty() ? GINT_TO_POINTER(1) : nullptr;
-  }
-_DEPRECATE_IFDEF_END
-
   explicit operator bool() const
   {
     return !empty();
diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
index 799f39a..ea6e9aa 100644
--- a/gtk/src/treemodel.hg
+++ b/gtk/src/treemodel.hg
@@ -100,24 +100,10 @@ public:
   typedef Children::iterator iterator;
   typedef Children::const_iterator const_iterator;
 
-  // Reverse iterator: https://bugzilla.gnome.org/show_bug.cgi?id=554889
-_DEPRECATE_IFDEF_START
-  /** @deprecated This reverse_iterator has never worked,
-   * use the normal (forward) iterator instead.
-   */
-  typedef Children::reverse_iterator reverse_iterator;
-
-  /** @deprecated This reverse_iterator has never worked,
-   * use the normal (forward) iterator instead.
-   */
-  typedef Children::const_reverse_iterator const_reverse_iterator;
-_DEPRECATE_IFDEF_END
-
   typedef TreeRow Row;
   typedef TreePath Path;
   typedef TreeRowReference RowReference;
 
-
   //These are part of GtkTreeModelFilter or GtkTreeModelSort, not GtkTreeModel:
   _IGNORE(gtk_tree_model_filter_new, gtk_tree_model_sort_new_with_model)
 
diff --git a/gtk/src/treepath.ccg b/gtk/src/treepath.ccg
index 6b5d327..57b7c25 100644
--- a/gtk/src/treepath.ccg
+++ b/gtk/src/treepath.ccg
@@ -75,13 +75,6 @@ TreePath::size_type TreePath::size() const
   return gtk_tree_path_get_depth(gobject_);
 }
 
-_DEPRECATE_IFDEF_START
-TreePath::operator const void*() const
-{
-  return !empty() ? GINT_TO_POINTER(1) : nullptr;
-}
-_DEPRECATE_IFDEF_END
-
 TreePath::operator bool() const
 {
   return !empty();
diff --git a/gtk/src/treepath.hg b/gtk/src/treepath.hg
index 233de94..05e0448 100644
--- a/gtk/src/treepath.hg
+++ b/gtk/src/treepath.hg
@@ -87,28 +87,6 @@ public:
   // I think it's OK for this assignment to be implicit.  It's very useful.
   TreePath& operator=(const TreeModel::iterator& iter);
 
-_DEPRECATE_IFDEF_START
-  /** This typedef is just to make it more obvious that
-   * our operator const void* should be used like operator bool().
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  typedef const void* BoolExpr;
-
-  /** Checks that the path is not empty, by calling empty().
-   * For instance,
-   * @code
-   * if(treepath)
-   *   do_something()
-   * @endcode
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   *
-   * @newin{2,16}
-   */
-  operator BoolExpr() const;
-_DEPRECATE_IFDEF_END
-
   /** Checks that the path is not empty, by calling empty().
    * For instance,
    * @code
diff --git a/gtk/src/treerowreference.ccg b/gtk/src/treerowreference.ccg
index 83641f4..db6e3f4 100644
--- a/gtk/src/treerowreference.ccg
+++ b/gtk/src/treerowreference.ccg
@@ -26,13 +26,6 @@ TreeRowReference::TreeRowReference(const Glib::RefPtr<TreeModel>& model, const T
   gobject_ ( gtk_tree_row_reference_new(model->gobj(), const_cast<GtkTreePath*>(path.gobj())) )
 {}
 
-_DEPRECATE_IFDEF_START
-TreeRowReference::operator const void*() const
-{
-  return is_valid() ? GINT_TO_POINTER(1) : nullptr;
-}
-_DEPRECATE_IFDEF_END
-
 TreeRowReference::operator bool() const
 {
   return is_valid();
diff --git a/gtk/src/treerowreference.hg b/gtk/src/treerowreference.hg
index e0edf80..c23fbd5 100644
--- a/gtk/src/treerowreference.hg
+++ b/gtk/src/treerowreference.hg
@@ -38,26 +38,6 @@ class TreeRowReference
 public:
   TreeRowReference(const Glib::RefPtr<TreeModel>& model, const TreeModel::Path& path);
 
-_DEPRECATE_IFDEF_START
-  /** This typedef is just to make it more obvious that
-   * our operator const void* should be used like operator bool().
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  typedef const void* BoolExpr;
-
-  /** The same as is_valid().
-   * For instance,
-   * @code
-   * if(treerowreference)
-   *   do_something()
-   * @endcode
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  operator BoolExpr() const;
-_DEPRECATE_IFDEF_END
-
   /** The same as is_valid().
    * For instance,
    * @code
@@ -78,4 +58,3 @@ _DEPRECATE_IFDEF_END
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index 3a70273..5f5580c 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -114,18 +114,6 @@ public:
 
  // _WRAP_METHOD(void set_attributes(CellRenderer& cell_renderer, ...), )
 
-_DEPRECATE_IFDEF_START
-  /** For instance,
-   * void on_cell_data(Gtk::CellRenderer* cell, const Gtk::TreeModel::iterator& iter);
-   *
-   * This function is used instead of the standard attributes mapping for setting the column value, and 
should set the
-   * value of the column's cell renderer as appropriate.
-   *
-   * @deprecated Use SlotTreeCellData instead.
-   */
-  typedef sigc::slot<void, CellRenderer*, const Gtk::TreeModel::iterator&> SlotCellData;
-_DEPRECATE_IFDEF_END
-
   /** For instance,
    * void on_cell_data(Gtk::CellRenderer* cell, const Gtk::TreeModel::iterator& iter);
    *
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]