[gtkmm/gtkmm-2-24] Drawable: Deprecate some methods, adding replacements in Window.

[Murray Cumming <murrayc src gnome org>]

commit 4f23146ce819528fab32cb65fd91ac0bd6efe881
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 14 16:37:43 2011 +0100

    Drawable: Deprecate some methods, adding replacements in Window.
    
    * gdk/src/drawable.hg: Deprecate get_visual(), get_screen() and get_display().
    * gdk/src/window.hg: Added get_visual(), get_screen() and get_display().

 ChangeLog           |    7 +++++++
 gdk/src/drawable.hg |   12 ++++++------
 gdk/src/window.hg   |   12 ++++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ff1db7a..858f924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-14  Murray Cumming  <murrayc murrayc com>
 
+	Drawable: Deprecate some methods, adding replacements in Window.
+
+	* gdk/src/drawable.hg: Deprecate get_visual(), get_screen() and get_display().
+	* gdk/src/window.hg: Added get_visual(), get_screen() and get_display().
+
+2011-01-14  Murray Cumming  <murrayc murrayc com>
+
 	Display: Deprecate set_pointer_hooks() and unset_pointer_hooks().
 
 	* gdk/src/display.[hg|ccg]: Deprecate these methods with no replacements.
diff --git a/gdk/src/drawable.hg b/gdk/src/drawable.hg
index f896143..7a3eeaf 100644
--- a/gdk/src/drawable.hg
+++ b/gdk/src/drawable.hg
@@ -69,12 +69,12 @@ public:
   _WRAP_CREATE()
 
   _WRAP_METHOD(void get_size(int& width, int& height), gdk_drawable_get_size, deprecated "Use the const version of this method.")
-  _WRAP_METHOD(void get_size(int& width, int& height) const, gdk_drawable_get_size)
+  _WRAP_METHOD(void get_size(int& width, int& height) const, gdk_drawable_get_size, deprecated)
   _WRAP_METHOD(int get_depth() const, gdk_drawable_get_depth)
 
   _WRAP_METHOD(void set_colormap(const Glib::RefPtr<Colormap>& colormap), gdk_drawable_set_colormap)
   _WRAP_METHOD(Glib::RefPtr<Colormap> get_colormap(), gdk_drawable_get_colormap, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<Visual> get_visual(), gdk_drawable_get_visual, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<Visual> get_visual(), gdk_drawable_get_visual, refreturn, deprecated)
 
   _WRAP_METHOD(void draw_point(const Glib::RefPtr<const GC>& gc, int x, int y), gdk_draw_point, deprecated)
   
@@ -213,11 +213,11 @@ public:
                    const RgbCmap& cmap),
                gdk_draw_indexed_image, deprecated)
 
-  _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_drawable_get_screen, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_drawable_get_screen, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_drawable_get_screen, refreturn, deprecated)
+  _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_drawable_get_screen, refreturn, constversion, deprecated)
 
-  _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_drawable_get_display, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_drawable_get_display, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_drawable_get_display, refreturn, deprecated)
+  _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_drawable_get_display, refreturn, constversion, deprecated)
 
   #m4 _CONVERSION(`cairo_t*',`Cairo::RefPtr<Cairo::Context>',`Cairo::RefPtr<Cairo::Context>(new Cairo::Context($3, true /* has_reference */))')
   _WRAP_METHOD(Cairo::RefPtr<Cairo::Context> create_cairo_context(), gdk_cairo_create)
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index c834559..067985d 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -74,6 +74,16 @@ public:
   _WRAP_CREATE(const Glib::RefPtr<Window>& parent, GdkWindowAttr* attributes, int attributes_mask)
 
   _WRAP_METHOD(WindowType get_window_type() const, gdk_window_get_window_type)
+  
+  _WRAP_METHOD(Glib::RefPtr<Visual> get_visual(), gdk_window_get_visual, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Visual> get_visual() const, gdk_window_get_visual, refreturn, constversion)
+
+  _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_window_get_screen, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_window_get_screen, refreturn, constversion)
+  
+  _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_window_get_display, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_window_get_display, refreturn, constversion)
+
   _WRAP_METHOD(void show(), gdk_window_show)
   _WRAP_METHOD(void hide(), gdk_window_hide)
   _WRAP_METHOD(void withdraw(), gdk_window_withdraw)
@@ -189,6 +199,8 @@ public:
 
   _WRAP_METHOD(void get_user_data(gpointer* data), gdk_window_get_user_data)
   _WRAP_METHOD(void get_geometry(int& x, int& y, int& width, int& height, int& depth) const, gdk_window_get_geometry)
+  _WRAP_METHOD(int get_width() const, gdk_window_get_width)
+  _WRAP_METHOD(int get_height() const, gdk_window_get_height)
   _WRAP_METHOD(void get_position(int& x, int& y) const, gdk_window_get_position)
   _WRAP_METHOD(int get_origin(int& x, int& y) const, gdk_window_get_origin)
   _WRAP_METHOD(void get_root_coords(int x, int y, int& root_x, int& root_y), gdk_window_get_root_coords)