No changes, just remove unnecessary wxPickerBase::OnSize().

[wxWidgets.git] / include / wx / msw / winundef.h

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index d67649a9647b20c92e0d30265c8a87dabd15d20c..41cea6dc9025d97d7eae68c2b75939396f43b1b9 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -43,6 +43,40 @@
     }
 #endif
 
     }
 #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)
 // CreateWindow
 
 #if defined(CreateWindow)


@@ -89,11 +123,11 @@
 
     inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace)
     {
 
     inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace)
     {

-        #ifdef UNICODE
+        #ifdef _UNICODE

             return FindTextW(lpfindreplace);
         #else
             return FindTextA(lpfindreplace);
             return FindTextW(lpfindreplace);
         #else
             return FindTextA(lpfindreplace);

-        #endif // !UNICODE
+        #endif

     }
 #endif
 
     }
 #endif