enable wxDIB for Windows CE

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index d9eb7c339d872885342860e483004e790586ca03..01dad4ad0dd078100ddbb103390997c0d6e0bf18 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -27,8 +27,8 @@
 
 // CreateDialog
 
-//#ifdef(CreateDialog)
 #if !defined(__WXWINCE__) && defined(CreateDialog)
+// #if defined(CreateDialog)
     #undef CreateDialog
 
     inline HWND CreateDialog(HINSTANCE hInstance,
@@ -255,7 +255,7 @@
 // LoadIcon
 #ifdef LoadIcon
     #undef LoadIcon
-    inline HINSTANCE LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
+    inline HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
     {
         #ifdef _UNICODE
             return LoadIconW(hInstance, lpIconName);
@@ -265,6 +265,18 @@
     }
 #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
 
@@ -305,7 +317,11 @@
     #undef IsMaximized
     inline BOOL IsMaximized(HWND hwnd)
     {
+#ifdef __WXWINCE__
+        return FALSE;
+#else
         return IsZoomed(hwnd);
+#endif
     }
 #endif
 
@@ -315,7 +331,11 @@
     #undef GetFirstChild
     inline HWND GetFirstChild(HWND hwnd)
     {
+#ifdef __WXWINCE__
+        return 0;
+#else
         return GetTopWindow(hwnd);
+#endif
     }
 #endif
 
@@ -341,7 +361,7 @@
 
 // For WINE
 
-#if defined(GetWindowStyle) || defined(__WXWINE__)
+#if defined(GetWindowStyle)
   #undef GetWindowStyle
 #endif