removing outdated code

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index a3fd4e2ce7a2e32edd3c99e9fe0ee2e49df56578..92476738763c424c7c02669b501ecc7e636180a6 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -123,11 +123,11 @@
 
     inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace)
     {
 
     inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace)
     {

-        #ifdef UNICODE
+        #ifdef _UNICODE

             return FindTextW(lpfindreplace);
         #else
             return FindTextA(lpfindreplace);
             return FindTextW(lpfindreplace);
         #else
             return FindTextA(lpfindreplace);

-        #endif // !UNICODE
+        #endif

     }
 #endif
 
     }
 #endif
 


@@ -248,26 +248,20 @@
 #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

-   #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 )
-      #define DOCINFOW DOCINFO
-      #define DOCINFOA DOCINFO
+
+   // Work around a bug in very old MinGW headers that didn't define DOCINFOW
+   // and DOCINFOA but only DOCINFO in both ANSI and Unicode.
+   #if defined( __GNUG__ )
+      #if !wxCHECK_W32API_VERSION( 0, 5 )
+        #define DOCINFOW DOCINFO
+        #define DOCINFOA DOCINFO
+      #endif

    #endif
    #endif

+

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