Application of the most recent wxWebView patch, the only changes were so tab to space...

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 58d06dd9a043a19dd03f843c1c17492949b44ac9..41cea6dc9025d97d7eae68c2b75939396f43b1b9 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -43,6 +43,64 @@
     }
 #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)
+    #undef CreateWindow
+
+    inline HWND CreateWindow(LPCTSTR lpClassName,
+                             LPCTSTR lpWndClass,
+                             DWORD dwStyle,
+                             int x, int y, int w, int h,
+                             HWND hWndParent,
+                             HMENU hMenu,
+                             HINSTANCE hInstance,
+                             LPVOID lpParam)
+    {
+        #ifdef _UNICODE
+            return CreateWindowW(lpClassName, lpWndClass, dwStyle, x, y, w, h,
+                                 hWndParent, hMenu, hInstance, lpParam);
+        #else
+            return CreateWindowA(lpClassName, lpWndClass, dwStyle, x, y, w, h,
+                                 hWndParent, hMenu, hInstance, lpParam);
+        #endif
+    }
+#endif
+

 // LoadMenu
 
 #ifdef LoadMenu
 // LoadMenu
 
 #ifdef LoadMenu


@@ -65,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
 


@@ -314,7 +372,7 @@
 
 #ifdef IsMaximized
     #undef IsMaximized
 
 #ifdef IsMaximized
     #undef IsMaximized

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

     {
 #ifdef __WXWINCE__
         return FALSE;
     {
 #ifdef __WXWINCE__
         return FALSE;


@@ -328,7 +386,7 @@
 
 #ifdef GetFirstChild
     #undef GetFirstChild
 
 #ifdef GetFirstChild
     #undef GetFirstChild

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

     {
 #ifdef __WXWINCE__
         return 0;
     {
 #ifdef __WXWINCE__
         return 0;


@@ -338,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


@@ -393,7 +471,7 @@
 
 #if defined(__WXWINCE__) && defined(DrawIcon) //#ifdef DrawIcon
     #undef DrawIcon
 
 #if defined(__WXWINCE__) && defined(DrawIcon) //#ifdef DrawIcon
     #undef DrawIcon

-    inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon) 
+    inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon)

     {
         return DrawIconEx(hdc,x,y,hicon,0,0,0,NULL, DI_NORMAL) ;
     }
     {
         return DrawIconEx(hdc,x,y,hicon,0,0,0,NULL, DI_NORMAL) ;
     }