add Length, Tell, SetPlaybackRate and GetPlaybackRate - use Connect instead of messag...

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index aee51d4b515d6f3a281bbbbee6b637336c5c793a..1f711c2c4691e2cd06df243612a7b60c5198a0e5 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,


@@ -252,6 +251,32 @@
    }
 #endif
 
    }
 #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
 // LoadLibrary
 
 #ifdef LoadLibrary


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

+#ifdef __WXWINCE__
+        wxUnusedVar(hwnd);
+        return FALSE;
+#else

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

+#endif

     }
 #endif
 
     }
 #endif
 


@@ -301,7 +331,12 @@
     #undef GetFirstChild
     inline HWND GetFirstChild(HWND hwnd)
     {
     #undef GetFirstChild
     inline HWND GetFirstChild(HWND hwnd)
     {

+#ifdef __WXWINCE__
+        wxUnusedVar(hwnd);
+        return 0;
+#else

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

+#endif

     }
 #endif
 
     }
 #endif
 


@@ -327,7 +362,7 @@
 
 // For WINE
 
 
 // For WINE
 

-#if defined(GetWindowStyle) || defined(__WXWINE__)
+#if defined(GetWindowStyle)

   #undef GetWindowStyle
 #endif
 
   #undef GetWindowStyle
 #endif
 


@@ -360,7 +395,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) ;
     }