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 3d8a52e0200b40742fa86c3c53d3e834e3e11291..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
 


@@ -338,10 +372,9 @@
 
 #ifdef IsMaximized
     #undef IsMaximized
 
 #ifdef IsMaximized
     #undef IsMaximized

-    inline BOOL IsMaximized(HWND hwnd)
+    inline BOOL IsMaximized(HWND WXUNUSED_IN_WINCE(hwnd))

     {
 #ifdef __WXWINCE__
     {
 #ifdef __WXWINCE__

-        wxUnusedVar(hwnd);

         return FALSE;
 #else
         return IsZoomed(hwnd);
         return FALSE;
 #else
         return IsZoomed(hwnd);


@@ -353,10 +386,9 @@
 
 #ifdef GetFirstChild
     #undef GetFirstChild
 
 #ifdef GetFirstChild
     #undef GetFirstChild

-    inline HWND GetFirstChild(HWND hwnd)
+    inline HWND GetFirstChild(HWND WXUNUSED_IN_WINCE(hwnd))

     {
 #ifdef __WXWINCE__
     {
 #ifdef __WXWINCE__

-        wxUnusedVar(hwnd);

         return 0;
 #else
         return GetTopWindow(hwnd);
         return 0;
 #else
         return GetTopWindow(hwnd);


@@ -364,6 +396,26 @@
     }
 #endif
 
     }
 #endif
 

+// GetFirstSibling
+
+#ifdef GetFirstSibling
+    #undef GetFirstSibling
+    inline HWND GetFirstSibling(HWND hwnd)
+    {
+        return GetWindow(hwnd,GW_HWNDFIRST);
+    }
+#endif
+
+// GetLastSibling
+
+#ifdef GetLastSibling
+    #undef GetLastSibling
+    inline HWND GetLastSibling(HWND hwnd)
+    {
+        return GetWindow(hwnd,GW_HWNDLAST);
+    }
+#endif
+

 // GetPrevSibling
 
 #ifdef GetPrevSibling
 // GetPrevSibling
 
 #ifdef GetPrevSibling