]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/msw/winundef.h
WXWIN_COMPATIBILITY_2_2 should be 0 by default now
[wxWidgets.git] / include / wx / msw / winundef.h
index d1d961080831fd8c291bfe398578fc815072c668..41181e982a1c3382dbc841398d4831a45044c0c6 100644 (file)
@@ -27,7 +27,8 @@
 
 // CreateDialog
 
-#ifdef CreateDialog
+//#ifdef(CreateDialog)
+#if !defined(__WXWINCE__) && defined(CreateDialog)
     #undef CreateDialog
 
     inline HWND CreateDialog(HINSTANCE hInstance,
    }
 #endif
 
+// LoadIcon
+#ifdef LoadIcon
+    #undef LoadIcon
+    inline HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
+    {
+        #ifdef _UNICODE
+            return LoadIconW(hInstance, lpIconName);
+        #else // ANSI
+            return LoadIconA(hInstance, lpIconName);
+        #endif // Unicode/ANSI
+    }
+#endif // LoadIcon
+
+// LoadBitmap
+#ifdef LoadBitmap
+    #undef LoadBitmap
+    inline HBITMAP LoadBitmap(HINSTANCE hInstance, LPCTSTR lpBitmapName)
+    {
+        #ifdef _UNICODE
+            return LoadBitmapW(hInstance, lpBitmapName);
+        #else // ANSI
+            return LoadBitmapA(hInstance, lpBitmapName);
+        #endif // Unicode/ANSI
+    }
+#endif // LoadBitmap
+
 // LoadLibrary
 
 #ifdef LoadLibrary
     #undef IsMaximized
     inline BOOL IsMaximized(HWND hwnd)
     {
+#ifdef __WXWINCE__
+        return FALSE;
+#else
         return IsZoomed(hwnd);
+#endif
     }
 #endif
 
     #undef GetFirstChild
     inline HWND GetFirstChild(HWND hwnd)
     {
+#ifdef __WXWINCE__
+        return 0;
+#else
         return GetTopWindow(hwnd);
+#endif
     }
 #endif
 
 
 // For WINE
 
-#if defined(GetWindowStyle) || defined(__WXWINE__)
+#if defined(GetWindowStyle)
   #undef GetWindowStyle
 #endif
 
     #undef Yield
 #endif
 
+
+#if defined(__WXWINCE__) && defined(DrawIcon) //#ifdef DrawIcon
+    #undef DrawIcon
+    inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon) 
+    {
+        return DrawIconEx(hdc,x,y,hicon,0,0,0,NULL, DI_NORMAL) ;
+    }
+#endif
+
+
 // GetWindowProc
 //ifdef GetWindowProc
 //   #undef GetWindowProc