Added missing "const" for operator== and operator!=.

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index e580f2465070e6e03dd274880b0da3bf979f3a88..ece9c4c92ab143b88a24bef0a8d393a9f3b24bdf 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -25,6 +25,54 @@
 // elsewhere because the functions, unlike the macros, respect the scope.
 // ----------------------------------------------------------------------------
 
 // elsewhere because the functions, unlike the macros, respect the scope.
 // ----------------------------------------------------------------------------
 

+// CreateDialog
+
+#if defined(CreateDialog)
+    #undef CreateDialog
+
+    inline HWND CreateDialog(HINSTANCE hInstance,
+                             LPCTSTR pTemplate,
+                             HWND hwndParent,
+                             DLGPROC pDlgProc)
+    {
+        #ifdef _UNICODE
+            return CreateDialogW(hInstance, pTemplate, hwndParent, pDlgProc);
+        #else
+            return CreateDialogA(hInstance, pTemplate, hwndParent, pDlgProc);
+        #endif
+    }
+#endif
+
+// LoadMenu
+
+#ifdef LoadMenu
+    #undef LoadMenu
+
+    inline HMENU LoadMenu(HINSTANCE instance, LPCTSTR name)
+    {
+        #ifdef _UNICODE
+            return LoadMenuW(instance, name);
+        #else
+            return LoadMenuA(instance, name);
+        #endif
+    }
+#endif
+
+// FindText
+
+#ifdef FindText
+    #undef FindText
+
+    inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace)
+    {
+        #ifdef UNICODE
+            return FindTextW(lpfindreplace);
+        #else
+            return FindTextA(lpfindreplace);
+        #endif // !UNICODE
+    }
+#endif
+

 // GetCharWidth
 
 #ifdef GetCharWidth
 // GetCharWidth
 
 #ifdef GetCharWidth


@@ -56,6 +104,23 @@
    #endif
 #endif
 
    #endif
 #endif
 

+// PlaySound
+
+#ifdef PlaySound
+   #undef PlaySound
+   #ifdef _UNICODE
+   inline BOOL PlaySound(LPCWSTR pszSound, HMODULE hMod, DWORD fdwSound)
+   {
+      return PlaySoundW(pszSound, hMod, fdwSound);
+   }
+   #else
+   inline BOOL PlaySound(LPCSTR pszSound, HMODULE hMod, DWORD fdwSound)
+   {
+      return PlaySoundA(pszSound, hMod, fdwSound);
+   }
+   #endif
+#endif
+

 // GetClassName
 
 #ifdef GetClassName
 // GetClassName
 
 #ifdef GetClassName


@@ -124,23 +189,36 @@
    #endif
 #endif
 
    #endif
 #endif
 

+
+/*
+  When this file is included, sometimes the wxCHECK_W32API_VERSION macro
+  is undefined. With for example CodeWarrior this gives problems with
+  the following code:
+  #if 0 && wxCHECK_W32API_VERSION( 0, 5 )
+  Because CodeWarrior does macro expansion before test evaluation.
+  We define wxCHECK_W32API_VERSION here if it's undefined.
+*/
+#if !defined(__GNUG__) && !defined(wxCHECK_W32API_VERSION)
+    #define wxCHECK_W32API_VERSION(maj, min) (0)
+#endif
+

 // StartDoc
 
 #ifdef StartDoc
    #undef StartDoc
 // StartDoc
 
 #ifdef StartDoc
    #undef StartDoc

-   #ifdef __GNUG__
+   #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 )

       #define DOCINFOW DOCINFO
       #define DOCINFOA DOCINFO
    #endif
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {
       #define DOCINFOW DOCINFO
       #define DOCINFOA DOCINFO
    #endif
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {

-      return StartDocW(h, info);
+      return StartDocW(h, (DOCINFOW*) info);

    }
    #else
    inline int StartDoc(HDC h, CONST DOCINFOA* info)
    {
    }
    #else
    inline int StartDoc(HDC h, CONST DOCINFOA* info)
    {

-      return StartDocA(h, info);
+      return StartDocA(h, (DOCINFOA*) info);

    }
    #endif
 #endif
    }
    #endif
 #endif


@@ -173,31 +251,63 @@
    }
 #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
     #undef LoadLibrary
 // LoadLibrary
 
 #ifdef LoadLibrary
     #undef LoadLibrary

-    inline HINSTANCE LoadLibrary(LPCTSTR lpLibFileName)
-    {

     #ifdef _UNICODE
     #ifdef _UNICODE

+    inline HINSTANCE LoadLibrary(LPCWSTR lpLibFileName)
+    {

         return LoadLibraryW(lpLibFileName);
         return LoadLibraryW(lpLibFileName);

+    }

     #else
     #else

+    inline HINSTANCE LoadLibrary(LPCSTR lpLibFileName)
+    {

         return LoadLibraryA(lpLibFileName);
         return LoadLibraryA(lpLibFileName);

-    #endif

     }
     }

+    #endif

 #endif
 
 // FindResource
 #ifdef FindResource
     #undef FindResource
 #endif
 
 // FindResource
 #ifdef FindResource
     #undef FindResource

-    inline HRSRC FindResource(HMODULE hModule, LPCTSTR lpName, LPCTSTR lpType)
-    {

     #ifdef _UNICODE
     #ifdef _UNICODE

+    inline HRSRC FindResource(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType)
+    {

         return FindResourceW(hModule, lpName, lpType);
         return FindResourceW(hModule, lpName, lpType);

+    }

     #else
     #else

+    inline HRSRC FindResource(HMODULE hModule, LPCSTR lpName, LPCSTR lpType)
+    {

         return FindResourceA(hModule, lpName, lpType);
         return FindResourceA(hModule, lpName, lpType);

-    #endif

     }
     }

+    #endif

 #endif
 
 // IsMaximized
 #endif
 
 // IsMaximized


@@ -206,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
 


@@ -216,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
 


@@ -242,7 +360,7 @@
 
 // For WINE
 
 
 // For WINE
 

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

   #undef GetWindowStyle
 #endif
 
   #undef GetWindowStyle
 #endif
 


@@ -267,6 +385,21 @@
    }
 #endif
 
    }
 #endif
 

+
+#ifdef Yield
+    #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
 // GetWindowProc
 //ifdef GetWindowProc
 //   #undef GetWindowProc