fixed library order (important for static linking under Unix

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 41181e982a1c3382dbc841398d4831a45044c0c6..3d8a52e0200b40742fa86c3c53d3e834e3e11291 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     16.05.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     16.05.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -27,8 +27,7 @@
 
 // CreateDialog
 
 
 // CreateDialog
 

-//#ifdef(CreateDialog)
-#if !defined(__WXWINCE__) && defined(CreateDialog)
+#if defined(CreateDialog)

     #undef CreateDialog
 
     inline HWND CreateDialog(HINSTANCE hInstance,
     #undef CreateDialog
 
     inline HWND CreateDialog(HINSTANCE hInstance,


@@ -44,6 +43,30 @@
     }
 #endif
 
     }
 #endif
 

+// 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


@@ -318,6 +341,7 @@
     inline BOOL IsMaximized(HWND hwnd)
     {
 #ifdef __WXWINCE__
     inline BOOL IsMaximized(HWND hwnd)
     {
 #ifdef __WXWINCE__

+        wxUnusedVar(hwnd);

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


@@ -332,6 +356,7 @@
     inline HWND GetFirstChild(HWND hwnd)
     {
 #ifdef __WXWINCE__
     inline HWND GetFirstChild(HWND hwnd)
     {
 #ifdef __WXWINCE__

+        wxUnusedVar(hwnd);

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


@@ -394,7 +419,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) ;
     }