improvements to zlib streams (patch 929416):

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 905e0a443887f9253201c7c639e102e4534d30cc..ece9c4c92ab143b88a24bef0a8d393a9f3b24bdf 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -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,


@@ -265,6 +264,18 @@
     }
 #endif // LoadIcon
 
     }
 #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
 
 
 // LoadLibrary
 


@@ -305,7 +316,11 @@
     #undef IsMaximized
     inline BOOL IsMaximized(HWND hwnd)
     {
     #undef IsMaximized
     inline BOOL IsMaximized(HWND hwnd)
     {

+#ifdef __WXWINCE__
+        return FALSE;
+#else

         return IsZoomed(hwnd);
         return IsZoomed(hwnd);

+#endif

     }
 #endif
 
     }
 #endif
 


@@ -315,7 +330,11 @@
     #undef GetFirstChild
     inline HWND GetFirstChild(HWND hwnd)
     {
     #undef GetFirstChild
     inline HWND GetFirstChild(HWND hwnd)
     {

+#ifdef __WXWINCE__
+        return 0;
+#else

         return GetTopWindow(hwnd);
         return GetTopWindow(hwnd);

+#endif

     }
 #endif
 
     }
 #endif