gdiplus: C++ fixes for headers.

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;

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

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