Iain Arnell : gdiplus: C++ fixes for headers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: aef85c72c8ac111f108ee7b2de23322ab98b755e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aef85c72c8ac111f108ee7b2de23322ab98b755e

Author: Iain Arnell <iarnell at gmail.com>
Date:   Tue Feb  1 08:49:46 2011 +0100

gdiplus: C++ fixes for headers.

---

 include/gdiplusenums.h   |    2 +-
 include/gdiplusgpstubs.h |    2 ++
 include/gdiplustypes.h   |   25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h
index 82f20eb..dc03b29 100644
--- a/include/gdiplusenums.h
+++ b/include/gdiplusenums.h
@@ -734,7 +734,7 @@ typedef enum StringTrimming StringTrimming;
 typedef enum FontStyle FontStyle;
 typedef enum StringFormatFlags StringFormatFlags;
 typedef enum HotkeyPrefix HotkeyPrefix;
-typedef enum PenAlignment GpPenAlignment;
+typedef enum PenAlignment PenAlignment;
 typedef enum PaletteFlags PaletteFlags;
 typedef enum ImageCodecFlags ImageCodecFlags;
 typedef enum CombineMode CombineMode;
diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h
index 3edc1f4..5a65cd8 100644
--- a/include/gdiplusgpstubs.h
+++ b/include/gdiplusgpstubs.h
@@ -22,6 +22,7 @@
 #ifdef __cplusplus
 
 class GpGraphics {};
+class GpPen {};
 class GpBrush {};
 class GpHatch : public GpBrush {};
 class GpSolidFill : public GpBrush {};
@@ -92,6 +93,7 @@ typedef WrapMode GpWrapMode;
 typedef Color GpColor;
 typedef FlushIntention GpFlushIntention;
 typedef CoordinateSpace GpCoordinateSpace;
+typedef PenAlignment GpPenAlignment;
 typedef PenType GpPenType;
 
 #endif
diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h
index 4f97432..816dba8 100644
--- a/include/gdiplustypes.h
+++ b/include/gdiplustypes.h
@@ -199,6 +199,31 @@ public:
     INT Height;
 };
 
+class CharacterRange
+{
+public:
+    CharacterRange()
+    {
+        First = Length = 0;
+    }
+
+    CharacterRange(INT first, INT length)
+    {
+        First = first;
+        Length = length;
+    }
+
+    CharacterRange& operator=(const CharacterRange& rhs)
+    {
+        First = rhs.First;
+        Length = rhs.Length;
+        return *this;
+    }
+public:
+    INT First;
+    INT Length;
+};
+
 #else /* end of c++ typedefs */
 
 typedef struct Point