[gtkmm] gdkmm: Window: Add default values to shape_combine_*().
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] gdkmm: Window: Add default values to shape_combine_*().
- Date: Wed, 22 Sep 2010 08:02:47 +0000 (UTC)
commit 19182bf547cf9d9b796ed670027afe872c264eb7
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Sep 22 10:02:20 2010 +0200
gdkmm: Window: Add default values to shape_combine_*().
* gdk/src/window.hg: shape_combine_mask(), shape_combine_region():
* gtk/src/widget.hg: shape_combine_mask(): Add default values.
ChangeLog | 6 ++++++
gdk/src/window.hg | 16 ++++++++--------
gtk/src/widget.hg | 4 ++--
3 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a6ff16b..d8bf1fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-22 Murray Cumming <murrayc murrayc com>
+
+ gtkmm: Window: Add default values to shape_combine_mask().
+
+ * gdk/src/window.hg: shape_combine_mask(): Add default values.
+
2010-09-20 Murray Cumming <murrayc murrayc com>
CellRenderer: Derive from CellSizeRequest instead of SizeRequest.
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 1835027..3cb1b21 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -113,10 +113,10 @@ public:
_WRAP_METHOD(void move_region(const Cairo::RefPtr<Cairo::Region>& region, int dx, int dy), gdk_window_move_region)
_WRAP_METHOD(bool ensure_native(), gdk_window_ensure_native)
- _WRAP_METHOD(void shape_combine_mask(const Glib::RefPtr<Bitmap>& mask, int x, int y), gdk_window_shape_combine_mask)
+ _WRAP_METHOD(void shape_combine_mask(const Glib::RefPtr<Bitmap>& mask, int x = 0, int y = 0), gdk_window_shape_combine_mask)
void unset_shape_combine_mask();
- _WRAP_METHOD(void shape_combine_region(const Cairo::RefPtr<Cairo::Region>& shape_region, int offset_x, int offset_y), gdk_window_shape_combine_region)
+ _WRAP_METHOD(void shape_combine_region(const Cairo::RefPtr<Cairo::Region>& shape_region, int offset_x = 0, int offset_y = 0), gdk_window_shape_combine_region)
_WRAP_METHOD(void set_child_shapes(), gdk_window_set_child_shapes)
_WRAP_METHOD(bool get_composited() const, gdk_window_get_composited)
_WRAP_METHOD(void set_composited(bool composited = TRUE), gdk_window_set_composited)
@@ -171,12 +171,12 @@ public:
#m4 _CONVERSION(const Cursor&,GdkCursor*,const_cast<GdkCursor*>(($3).gobj()))
_WRAP_METHOD(void set_cursor(const Cursor& cursor), gdk_window_set_cursor)
-
+
/** Use the parent window's cursor.
* For top-level windows this means that it will use the default cursor for the ROOT window.
*/
void set_cursor();
-
+
_WRAP_METHOD(void set_device_cursor(const Glib::RefPtr<Device>& device, const Cursor& cursor), gdk_window_set_device_cursor)
/** Use the parent window's cursor.
@@ -205,7 +205,7 @@ public:
_WRAP_METHOD(Glib::RefPtr<const Window> get_parent() const, gdk_window_get_parent, refreturn, constversion)
_WRAP_METHOD(Glib::RefPtr<Window> get_toplevel(), gdk_window_get_toplevel, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Window> get_toplevel() const, gdk_window_get_toplevel, refreturn, constversion)
-
+
_WRAP_METHOD(Glib::RefPtr<Window> get_device_position(const Glib::RefPtr<const Device>& device, int& x, int& y, ModifierType& mask) const, gdk_window_get_device_position, refreturn)
_WRAP_METHOD(Glib::RefPtr<Window> get_effective_parent(), gdk_window_get_effective_parent, refreturn)
@@ -219,10 +219,10 @@ public:
_WRAP_METHOD(EventMask get_events() const, gdk_window_get_events)
_WRAP_METHOD(void set_events(EventMask event_mask), gdk_window_set_events)
-
+
_WRAP_METHOD(EventMask get_device_events(const Glib::RefPtr<const Device>& device) const, gdk_window_get_device_events)
_WRAP_METHOD(void set_device_events(const Glib::RefPtr<Device>& device, EventMask event_mask), gdk_window_set_device_events)
-
+
_WRAP_METHOD(void set_icon_list(const Glib::ListHandle< Glib::RefPtr<Gdk::Pixbuf> >& pixbufs), gdk_window_set_icon_list)
_WRAP_METHOD(void set_icon(const Glib::RefPtr<Window>& icon_window, const Glib::RefPtr<Pixmap>& pixmap, const Glib::RefPtr<Bitmap>& mask), gdk_window_set_icon)
void set_icon(const Glib::RefPtr<Window>& icon_window, const Glib::RefPtr<Pixmap>& pixmap);
@@ -264,7 +264,7 @@ public:
void invalidate(bool invalidate_children);
_WRAP_METHOD(void invalidate_region(const Cairo::RefPtr<Cairo::Region>& region, bool invalidate_children = true), gdk_window_invalidate_region)
-
+
//TODO:
/*
void gdk_window_invalidate_maybe_recurse (GdkWindow *window,
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 7f3e4b9..7ecc13f 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -498,9 +498,9 @@ public:
_WRAP_METHOD(static TextDirection get_default_direction(), gtk_widget_get_default_direction)
/* Shape masking */
- _WRAP_METHOD(void shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x, int offset_y), gtk_widget_shape_combine_mask)
+ _WRAP_METHOD(void shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x = 0, int offset_y = 0), gtk_widget_shape_combine_mask)
void unset_shape_combine_mask();
- _WRAP_METHOD(void input_shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x, int offset_y), gtk_widget_input_shape_combine_mask)
+ _WRAP_METHOD(void input_shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x = 0, int offset_y = 0), gtk_widget_input_shape_combine_mask)
void unset_input_shape_combine_mask();
// must be realized
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]