[gtkmm] gdkmm: Visual: Wrapped remaining methods.



commit edc4cc495714e39350144d44ec1965e09e8e4ce2
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Sep 15 21:30:16 2010 +0200

    gdkmm: Visual: Wrapped remaining methods.
    
    * gdk/src/visual.hg: Added get_visual_type(), get_depth(), get_byte_order(),
    get_colormap_size(), get_bits_per_rgb(), get_red_pixel_details(),
    get_green_pixel_details(), get_blue_pixel_details().
    * tools/m4/convert_gdk.m4: Added guint32& -> guint32* conversion.
    * gdk/src/colormap.hg: Remove query_color(), removed from GTK+.

 ChangeLog               |   12 +++++++++++-
 gdk/src/colormap.hg     |    2 --
 gdk/src/visual.hg       |   11 +++++++++++
 tools/m4/convert_gdk.m4 |    1 +
 4 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3928b16..2ac8b55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
 2010-09-15  Murray Cumming  <murrayc murrayc com>
 
-	Display: Fix build error in get_protocol_for_disply().
+	gdkmm: Visual: Wrapped remaining methods.
+
+	* gdk/src/visual.hg: Added get_visual_type(), get_depth(), get_byte_order(), 
+	get_colormap_size(), get_bits_per_rgb(), get_red_pixel_details(), 
+	get_green_pixel_details(), get_blue_pixel_details().
+	* tools/m4/convert_gdk.m4: Added guint32& -> guint32* conversion.
+	* gdk/src/colormap.hg: Remove query_color(), removed from GTK+.
+
+2010-09-15  Murray Cumming  <murrayc murrayc com>
+
+	gdkmm: Display: Fix build error in get_protocol_for_disply().
 
 	* gdk/src/display.[hg|ccg]: get_protocol_for_display(): Remove the ifdef 
 	around this, because this remaining version is not win32-only. Remove the 
diff --git a/gdk/src/colormap.hg b/gdk/src/colormap.hg
index 952bb49..32d3216 100644
--- a/gdk/src/colormap.hg
+++ b/gdk/src/colormap.hg
@@ -64,8 +64,6 @@ public:
   _WRAP_METHOD(bool alloc_color(Color& color, bool writeable = false, bool best_match = true), gdk_colormap_alloc_color)
   void free_color(Color& color);
 
-  _WRAP_METHOD(void query_color (gulong pixel, Color& result), gdk_colormap_query_color)
-
   _WRAP_METHOD(Glib::RefPtr<Visual> get_visual(), gdk_colormap_get_visual, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Visual> get_visual() const, gdk_colormap_get_visual, refreturn, constversion)
   
diff --git a/gdk/src/visual.hg b/gdk/src/visual.hg
index adcf91e..2dd5e00 100644
--- a/gdk/src/visual.hg
+++ b/gdk/src/visual.hg
@@ -75,6 +75,17 @@ public:
 
    _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_visual_get_screen, refreturn)
    _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_visual_get_screen, refreturn, constversion)
+   
+   
+   _WRAP_METHOD(VisualType get_visual_type() const, gdk_visual_get_visual_type)
+   _WRAP_METHOD(int get_depth() const, gdk_visual_get_depth)
+   _WRAP_METHOD(ByteOrder get_byte_order(), gdk_visual_get_byte_order)
+   _WRAP_METHOD(int get_colormap_size() const, gdk_visual_get_colormap_size)
+   _WRAP_METHOD(int get_bits_per_rgb() const, gdk_visual_get_bits_per_rgb)
+   _WRAP_METHOD(void get_red_pixel_details(guint32& mask, int& shift, int& precision) const, gdk_visual_get_red_pixel_details)
+   _WRAP_METHOD(void get_green_pixel_details(guint32& mask, int& shift, int& precision) const, gdk_visual_get_green_pixel_details)
+   _WRAP_METHOD(void get_blue_pixel_details(guint32& mask, int& shift, int& precision) const, gdk_visual_get_blue_pixel_details)
+                                                  
 };
 
 } //namespace Gdk
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index cb233e4..659e2ed 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -67,6 +67,7 @@ _CONV_ENUM(Gdk,WMFunction)
 _CONV_ENUM(Gdk,GrabStatus)
 _CONV_ENUM(Gdk,PixbufRotation)
 
+_CONVERSION(`guint32&',`guint32*',`&($3)')
 
 _CONVERSION(`Gdk::EventMask',`gint',`$3')
 _CONVERSION(`gint',`Gdk::EventMask',`static_cast<Gdk::EventMask>($3)')



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