#undef CreateFont to fix cygwin compilation now that wxRichTextCtrl uses it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index d67649a9647b20c92e0d30265c8a87dabd15d20c..a3fd4e2ce7a2e32edd3c99e9fe0ee2e49df56578 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -43,6 +43,40 @@
     }
 #endif
 
+// CreateFont
+
+#ifdef CreateFont
+    #undef CreateFont
+
+    inline HFONT CreateFont(int height,
+                            int width,
+                            int escapement,
+                            int orientation,
+                            int weight,
+                            DWORD italic,
+                            DWORD underline,
+                            DWORD strikeout,
+                            DWORD charset,
+                            DWORD outprecision,
+                            DWORD clipprecision,
+                            DWORD quality,
+                            DWORD family,
+                            LPCTSTR facename)
+    {
+        #ifdef _UNICODE
+            return CreateFontW(height, width, escapement, orientation,
+                               weight, italic, underline, strikeout, charset,
+                               outprecision, clipprecision, quality,
+                               family, facename);
+        #else
+            return CreateFontA(height, width, escapement, orientation,
+                               weight, italic, underline, strikeout, charset,
+                               outprecision, clipprecision, quality,
+                               family, facename);
+        #endif
+    }
+#endif // CreateFont
+
 // CreateWindow
 
 #if defined(CreateWindow)