[gtkmm] gdkmm: Window: Added new methods.

[Murray Cumming <murrayc src gnome org>]

commit 4181262c82f0ddc82b4c78af5a79c151f892b74a
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Oct 1 14:58:20 2010 +0200

    gdkmm: Window: Added new methods.
    
    * gdk/src/window.hg: Added get_visual(), get_screen(), get_display(),
    set_backround_pattern(), get_offscreen_surface(), get_width(), get_height().
    Remove redirect_to_drawable(), remove_redirection, clear(),
    clear_area_a, which were no longer generated anyway because they have been
    removed from GTK+ (and therefore from our .defs).
    * gdk/srd/drawable.hg: Removed get_size(), get_depth(), set_colormap(),
    get_colormap(), get_visual(), get_screen() and get_display() which were
    also removed from GTK+. Presumably the new GdkWindow methods replace them.

 ChangeLog           |   15 ++++++++++++++-
 gdk/src/drawable.hg |   13 -------------
 gdk/src/window.hg   |   28 +++++++++++++++++++---------
 3 files changed, 33 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index abfc836..0403348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-01  Murray Cumming  <murrayc murrayc com>
+
+	gdkmm: Window: Added new methods.
+
+	* gdk/src/window.hg: Added get_visual(), get_screen(), get_display(), 
+	set_backround_pattern(), get_offscreen_surface(), get_width(), get_height().
+	Remove redirect_to_drawable(), remove_redirection, clear(), 
+	clear_area_a, which were no longer generated anyway because they have been 
+	removed from GTK+ (and therefore from our .defs).
+	* gdk/srd/drawable.hg: Removed get_size(), get_depth(), set_colormap(), 
+	get_colormap(), get_visual(), get_screen() and get_display() which were 
+	also removed from GTK+. Presumably the new GdkWindow methods replace them.
+
 2010-10-02  Armin Burgmeier  <armin arbur net>
 
 	* MSVC_Net2005/README:
@@ -35,7 +48,7 @@
   FileFilter, RecentFilter: Fix the reference counting.
 
 	* gtk/src/filefilter.hg:
-	* gtk/src/recentfilter.hg: Ue  _DERIVES_INITIALLY_UNOWNED() because these
+	* gtk/src/recentfilter.hg: Use _DERIVES_INITIALLY_UNOWNED() because these
   use GInitiallyUnowned though we don't derive from our Gtk::Object.
 
 2010-09-28  Murray Cumming  <murrayc murrayc com>
diff --git a/gdk/src/drawable.hg b/gdk/src/drawable.hg
index ff281ea..9bc1f72 100644
--- a/gdk/src/drawable.hg
+++ b/gdk/src/drawable.hg
@@ -64,13 +64,6 @@ protected:
 public:
   _WRAP_CREATE()
 
-  _WRAP_METHOD(void get_size(int& width, int& height) const, gdk_drawable_get_size)
-  _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)
-
   #m4 _CONVERSION(`cairo_region_t*',`Cairo::RefPtr<Cairo::Region>',`Cairo::RefPtr<Cairo::Region>(new Cairo::Region($3, true /* do not take ref */))')
 
   //This is const because it returns a copy (though that is not very clear from the C documentation)
@@ -79,12 +72,6 @@ public:
   //This is const because it returns a copy (though that is not very clear from the C documentation)
   _WRAP_METHOD(Cairo::RefPtr<Cairo::Region> get_visible_region() const, gdk_drawable_get_visible_region)
 
-  _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<Display> get_display(), gdk_drawable_get_display, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_drawable_get_display, refreturn, constversion)
-
   #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 93e53a2..72f9b18 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -71,6 +71,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)
@@ -79,9 +89,6 @@ public:
   _WRAP_METHOD(void resize(int width, int height), gdk_window_resize)
   _WRAP_METHOD(void move_resize(int x, int y, int width, int height), gdk_window_move_resize)
   _WRAP_METHOD(void reparent(const Glib::RefPtr<Window>& new_parent, int x, int y), gdk_window_reparent)
-  _WRAP_METHOD(void clear(), gdk_window_clear)
-  _WRAP_METHOD(void clear_area(int x, int y, int width, int height), gdk_window_clear_area)
-  _WRAP_METHOD(void clear_area_e(int x, int y, int width, int height), gdk_window_clear_area_e)
   _WRAP_METHOD(void raise(), gdk_window_raise)
   _WRAP_METHOD(void lower(), gdk_window_lower)
 
@@ -145,6 +152,9 @@ public:
   _WRAP_METHOD(void set_startup_id(const Glib::ustring& startup_id), gdk_window_set_startup_id)
   _WRAP_METHOD(void set_transient_for(const Glib::RefPtr<Window>& parent), gdk_window_set_transient_for)
   _WRAP_METHOD(void set_background(const Color& color), gdk_window_set_background)
+  
+#m4 _CONVERSION(`const Cairo::RefPtr<Cairo::Pattern>&',`cairo_pattern_t*',`($3)->cobj()')
+  _WRAP_METHOD(void set_background_pattern(const Cairo::RefPtr<Cairo::Pattern>& pattern), gdk_window_set_background_pattern);
 
   #m4 _CONVERSION(`cairo_pattern_t*',`Cairo::RefPtr<Cairo::Pattern>',`Cairo::RefPtr<Cairo::Pattern>(new Cairo::Pattern($3, false /* take reference */))')
   _WRAP_METHOD(Cairo::RefPtr<Cairo::Pattern> get_background_pattern(), gdk_window_get_background_pattern)
@@ -174,6 +184,9 @@ 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)
@@ -194,7 +207,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Window> get_effective_parent(), gdk_window_get_effective_parent, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Window> get_effective_parent() const, gdk_window_get_effective_parent, refreturn, constversion)
   _WRAP_METHOD(Glib::RefPtr<Window> get_effective_toplevel(), gdk_window_get_effective_toplevel, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Window> get_effective_toplevel() const, gdk_window_effective_get_toplevel, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<const Window> get_effective_toplevel() const, gdk_window_get_effective_toplevel, refreturn, constversion)
 
   _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Window> > get_children(), gdk_window_get_children)
   _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const Window> > get_children() const, gdk_window_get_children)
@@ -318,17 +331,14 @@ public:
 
   _WRAP_METHOD(static Glib::RefPtr<Window> get_default_root_window(), gdk_get_default_root_window, refreturn)
 
-  _WRAP_METHOD(Glib::RefPtr<Pixmap> get_offscreen_pixmap(), gdk_offscreen_window_get_pixmap, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Pixmap> get_offscreen_pixmap() const, gdk_offscreen_window_get_pixmap, constversion, refreturn)
+  _WRAP_METHOD(Cairo::RefPtr<Cairo::Surface> get_offscreen_surface(), gdk_offscreen_window_get_surface, refreturn)
+  _WRAP_METHOD(Cairo::RefPtr<const Cairo::Surface> get_offscreen_surface() const, gdk_offscreen_window_get_surface, constversion, refreturn)
 
   _WRAP_METHOD(Glib::RefPtr<Window> get_offscreen_embedder(), gdk_offscreen_window_get_embedder, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Window> get_offscreen_embedder() const, gdk_offscreen_window_get_embedder, constversion, refreturn)
 
   _WRAP_METHOD(void set_offscreen_embedder(const Glib::RefPtr<Window>& embedder), gdk_offscreen_window_set_embedder)
 
-  _WRAP_METHOD(void redirect_to_drawable(const Glib::RefPtr<Drawable>& drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height), gdk_window_redirect_to_drawable)
-  _WRAP_METHOD(void remove_redirection(), gdk_window_remove_redirection)
-
   _WRAP_METHOD(void geometry_changed(), gdk_window_geometry_changed)
 
   _WRAP_METHOD(void set_support_multidevice(bool support_multidevice = true), gdk_window_set_support_multidevice)