[gtkmm] Removed newly-deprecated methods.



commit 8e77481e76c7a3b1aae446ed8ff7593722d8f187
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Nov 23 10:43:49 2009 +0100

    Removed newly-deprecated methods.

 atk/src/hyperlink.hg     |    6 +-----
 gdk/src/display.hg       |   13 ++++++++++++-
 gdk/src/event.hg         |    3 +--
 gdk/src/window.hg        |    3 +--
 gtk/src/action.hg        |    5 +----
 gtk/src/calendar.hg      |    3 +--
 gtk/src/cellview.hg      |    5 +----
 gtk/src/recentmanager.hg |    2 +-
 gtk/src/statusicon.hg    |    3 +--
 9 files changed, 20 insertions(+), 23 deletions(-)
---
diff --git a/atk/src/hyperlink.hg b/atk/src/hyperlink.hg
index 79fb6f8..d1948e9 100644
--- a/atk/src/hyperlink.hg
+++ b/atk/src/hyperlink.hg
@@ -15,10 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef ATK_DISABLE_DEPRECATED
-#m4 _POP()
-
 #include <atkmm/action.h>
 
 _DEFS(atkmm,atk)
@@ -50,7 +46,7 @@ public:
   _WRAP_METHOD(bool is_inline() const, atk_hyperlink_is_inline)
 
   _WRAP_METHOD(int get_n_anchors() const, atk_hyperlink_get_n_anchors)
-  _WRAP_METHOD(bool is_selected_link() const, atk_hyperlink_is_selected_link, deprecated)
+  _IGNORE(atk_hyperlink_is_selected_link) // deprecated
   _WRAP_SIGNAL(void link_activated(), "link_activated")
 
   _WRAP_PROPERTY("selected-link", bool)
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index 9014d5d..cbc6121 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -140,7 +140,18 @@ public:
   
   _WRAP_METHOD(static Glib::RefPtr<Display> open_default_libgtk_only(), gdk_display_open_default_libgtk_only, refreturn)
 
-  _WRAP_METHOD(GdkNativeWindow get_drag_protocol(GdkNativeWindow xid, GdkDragProtocol& protocol), gdk_drag_get_protocol_for_display)
+#ifdef G_OS_WIN32
+  /** Finds out the DND protocol supported by a window.
+   * 
+   * @newin{2,2}
+   * @param xid The X id of the destination window.
+   * @param protocol Location where the supported DND protocol is returned.
+   * @return The X id of the window where the drop should happen. This 
+   * may be @a xid or the X id of a proxy window, or None if @a xid doesn't
+   * support Drag and Drop.
+   */
+  WRAP_METHOD(GdkNativeWindow get_drag_protocol(GdkNativeWindow xid, GdkDragProtocol& protocol), gdk_drag_get_protocol_for_display)
+#endif
 
   _WRAP_METHOD(GdkKeymap* get_keymap(), gdk_keymap_get_for_display)
   _WRAP_METHOD(const GdkKeymap* get_keymap() const, gdk_keymap_get_for_display, constversion)
diff --git a/gdk/src/event.hg b/gdk/src/event.hg
index 43ba4ea..9c5fbfe 100644
--- a/gdk/src/event.hg
+++ b/gdk/src/event.hg
@@ -61,8 +61,7 @@ public:
 
   _WRAP_METHOD(static Event get(), gdk_event_get)
   _WRAP_METHOD(static Event peek(), gdk_event_peek)
-  _WRAP_METHOD(static Event get_graphics_expose(const Glib::RefPtr<Window>& window),
-               gdk_event_get_graphics_expose, deprecated)
+  _IGNORE(gdk_event_get_graphics_expose) //deprecated
   _WRAP_METHOD(void put(), gdk_event_put)
 
   _WRAP_METHOD(static bool events_pending(), gdk_events_pending)
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 660dc38..6549c12 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -209,8 +209,7 @@ public:
   _WRAP_METHOD(bool get_decorations(WMDecoration& decorations) const, gdk_window_get_decorations)
   _WRAP_METHOD(void set_functions(WMFunction functions), gdk_window_set_functions)
 
-  _WRAP_METHOD(static Glib::ListHandle< Glib::RefPtr<Window> > get_toplevels(),
-               gdk_window_get_toplevels, deprecated)
+  _IGNORE(gdk_window_get_toplevels) //deprecated
 
   _WRAP_METHOD(void beep(), gdk_window_beep)
 
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 5d41ee5..67b1d3f 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -161,10 +161,7 @@ public:
   _WRAP_METHOD(MenuItem* create_menu_item(), gtk_action_create_menu_item)
   _WRAP_METHOD(ToolItem* create_tool_item(), gtk_action_create_tool_item)
   _WRAP_METHOD(Menu* create_menu(), gtk_action_create_menu)
-
-  //TODO: Deprecate these when we can derive the appropriate widgets from Activatable, when we can break ABI.
-  _WRAP_METHOD(void connect_proxy(Widget& proxy), gtk_action_connect_proxy)
-  _WRAP_METHOD(void disconnect_proxy(Widget& proxy), gtk_action_disconnect_proxy)
+  _IGNORE(gtk_action_connect_proxy, gtk_action_disconnect_proxy) // deprecated
 
 #m4 dnl // This isn't in convert_gtk.m4, and the default behaviour is wrong.
 #m4 _CONVERSION(`GSList*', `Glib::SListHandle<Widget*>', `$2($3, Glib::OWNERSHIP_NONE)')
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index 55e37be..0e9ffbe 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -120,8 +120,7 @@ public:
   _WRAP_METHOD(int get_detail_width_chars() const, gtk_calendar_get_detail_width_chars)
   _WRAP_METHOD(int get_detail_height_rows() const, gtk_calendar_get_detail_height_rows)
 
-  _WRAP_METHOD(void freeze(), gtk_calendar_freeze, deprecated)
-  _WRAP_METHOD(void thaw(), gtk_calendar_thaw, deprecated)
+  _IGNORE(gtk_calendar_freeze, gtk_calendar_thaw) //deprecated
 
   _WRAP_SIGNAL(void month_changed(), "month_changed")
   _WRAP_SIGNAL(void day_selected(), "day_selected")
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index 65bc4c6..ca2e226 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -89,10 +89,7 @@ public:
 
   _WRAP_METHOD(void set_background_color(const Gdk::Color& color), gtk_cell_view_set_background_color)
 
-  _WRAP_METHOD(Glib::ListHandle<CellRenderer*> get_cell_renderers(),
-               gtk_cell_view_get_cell_renderers, deprecated)
-  _WRAP_METHOD(Glib::ListHandle<const CellRenderer*> get_cell_renderers() const,
-               gtk_cell_view_get_cell_renderers, deprecated)
+  _IGNORE(gtk_cell_view_get_cell_renderers) //deprecated
 
   _WRAP_PROPERTY("background", Glib::ustring)
   _WRAP_PROPERTY("background-gdk", Gdk::Color)
diff --git a/gtk/src/recentmanager.hg b/gtk/src/recentmanager.hg
index 77122cc..f9e5399 100644
--- a/gtk/src/recentmanager.hg
+++ b/gtk/src/recentmanager.hg
@@ -74,7 +74,7 @@ public:
   _WRAP_CREATE()
 
   _WRAP_METHOD(static Glib::RefPtr<RecentManager> get_default(), gtk_recent_manager_get_default, refreturn)
-  _WRAP_METHOD(static Glib::RefPtr<RecentManager> get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_recent_manager_get_for_screen, refreturn, deprecated)
+  _IGNORE(gtk_recent_manager_get_for_screen, refreturn, deprecated)
 
   /** Meta-data passed to add_item().  You should
    * use RecentManager::Data if you want to control the meta-data associated
diff --git a/gtk/src/statusicon.hg b/gtk/src/statusicon.hg
index 9b431a3..42862d5 100644
--- a/gtk/src/statusicon.hg
+++ b/gtk/src/statusicon.hg
@@ -105,8 +105,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_status_icon_get_screen, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_status_icon_get_screen, refreturn, constversion)
 
-  _WRAP_METHOD(void set_tooltip(const Glib::ustring& tooltip_text),
-               gtk_status_icon_set_tooltip, deprecated)
+  _IGNORE(gtk_status_icon_set_tooltip) //deprecated
 
   _WRAP_METHOD(void set_visible(bool visible = true), gtk_status_icon_set_visible)
   _WRAP_METHOD(bool get_visible() const, gtk_status_icon_get_visible)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]