[pangomm] Renderer: Change RendererPart to Renderer::Part.



commit 8c362ebe25d0e1d0386158cbad7b542d8e3a92af
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Apr 19 11:01:37 2017 +0200

    Renderer: Change RendererPart to Renderer::Part.

 pango/src/renderer.hg     |   23 ++++++++++-------------
 tools/m4/convert_pango.m4 |    2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/pango/src/renderer.hg b/pango/src/renderer.hg
index 9ac0d48..02d5704 100644
--- a/pango/src/renderer.hg
+++ b/pango/src/renderer.hg
@@ -35,8 +35,6 @@ namespace Pango
 
 _CC_INCLUDE(pango/pango-enum-types.h)
 
-_WRAP_ENUM(RenderPart, PangoRenderPart)
-
 /** Pango::Renderer is a base class that contains the necessary logic for rendering a Pango::Layout or 
Pango::LayoutLine. 
  * By subclassing Pango::Renderer and overriding operations such as draw_glyphs and draw_rectangle, 
  * renderers for particular font backends and destinations can be created.
@@ -44,32 +42,31 @@ _WRAP_ENUM(RenderPart, PangoRenderPart)
 class Renderer : public Glib::Object
 {
   _CLASS_GOBJECT(Renderer, PangoRenderer, PANGO_RENDERER, Glib::Object, GObject)
- 
-protected:
- 
+
 public:
+  _WRAP_ENUM(Part, PangoRenderPart)
 
   _WRAP_METHOD(void draw_layout(const Glib::RefPtr<Layout>& layout, int x, int y), 
pango_renderer_draw_layout)
   _WRAP_METHOD(void draw_layout_line(const Glib::RefPtr<LayoutLine>& line, int x, int y), 
pango_renderer_draw_layout_line)
   _WRAP_METHOD(void draw_glyphs(const Glib::RefPtr<Font>& font, const GlyphString& glyphs, int x, int y), 
pango_renderer_draw_glyphs)
   _WRAP_METHOD(void draw_glyph_item(const Glib::ustring& text, const GlyphItem& glyph_item, int x, int y), 
pango_renderer_draw_glyph_item)
-  _WRAP_METHOD(void draw_rectangle(RenderPart part, int x, int y, int width, int height), 
pango_renderer_draw_rectangle)
+  _WRAP_METHOD(void draw_rectangle(Part part, int x, int y, int width, int height), 
pango_renderer_draw_rectangle)
   _WRAP_METHOD(void draw_error_underline(int x, int y, int width, int height), 
pango_renderer_draw_error_underline)
-  _WRAP_METHOD(void draw_trapezoid(RenderPart part, double y1, double x11, double x21, double y2, double 
x12, double x22), pango_renderer_draw_trapezoid)
+  _WRAP_METHOD(void draw_trapezoid(Part part, double y1, double x11, double x21, double y2, double x12, 
double x22), pango_renderer_draw_trapezoid)
   _WRAP_METHOD(void draw_glyph(const Glib::RefPtr<Font>& font, Glyph glyph, double x, double y), 
pango_renderer_draw_glyph)
 
   _WRAP_METHOD(void activate(), pango_renderer_activate)
   _WRAP_METHOD(void deactivate(), pango_renderer_deactivate)
 
-  _WRAP_METHOD(void part_changed(RenderPart part), pango_renderer_part_changed)
+  _WRAP_METHOD(void part_changed(Part part), pango_renderer_part_changed)
+
+  _WRAP_METHOD(void set_color(Part part, const Color& color), pango_renderer_set_color)
 
-  _WRAP_METHOD(void set_color(RenderPart part, const Color& color), pango_renderer_set_color)
-  
 #m4 _CONVERSION(`PangoColor*',`Color',`Color($3)')
-  _WRAP_METHOD(Color get_color(RenderPart part) const, pango_renderer_get_color)
+  _WRAP_METHOD(Color get_color(Part part) const, pango_renderer_get_color)
 
-  _WRAP_METHOD(void set_alpha(RenderPart part, guint16 alpha), pango_renderer_set_alpha)
-  _WRAP_METHOD(guint16 get_alpha(RenderPart part) const, pango_renderer_get_alpha)
+  _WRAP_METHOD(void set_alpha(Part part, guint16 alpha), pango_renderer_set_alpha)
+  _WRAP_METHOD(guint16 get_alpha(Part part) const, pango_renderer_get_alpha)
 
   _WRAP_METHOD(void set_matrix(const Matrix& matrix), pango_renderer_set_matrix)
 
diff --git a/tools/m4/convert_pango.m4 b/tools/m4/convert_pango.m4
index fde37b9..8047b74 100644
--- a/tools/m4/convert_pango.m4
+++ b/tools/m4/convert_pango.m4
@@ -14,7 +14,7 @@ _CONV_ENUM(Pango,WrapMode)
 _CONV_ENUM(Pango,TabAlign)
 _CONV_ENUM(Pango,Script)
 _CONV_ENUM(Pango,EllipsizeMode)
-_CONV_ENUM(Pango,RenderPart)
+_CONV_INCLASS_ENUM(Pango,Render,Part)
 _CONV_ENUM(Pango,Gravity)
 _CONV_ENUM(Pango,GravityHint)
 


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