Some #include and #if wxUSE_XX things

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 3d657f4c21f063befc26cada049bce2a2f2eea54..ac2fa36577be717723e9cc00be3100735f4ab548 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -9,8 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+/* THIS SHOULD NOT BE USED since you might include it once e.g. in window.h,
+ * then again _AFTER_ you've included windows.h, in which case it won't work
+ * a 2nd time -- JACS

 #ifndef _WX_WINUNDEF_H_
 #define _WX_WINUNDEF_H_
 #ifndef _WX_WINUNDEF_H_
 #define _WX_WINUNDEF_H_

+ */

 
 // windows.h #defines the following identifiers which are also used in wxWin
 
 
 // windows.h #defines the following identifiers which are also used in wxWin
 


@@ -117,7 +121,7 @@
 
 #ifdef StartDoc
    #undef StartDoc
 
 #ifdef StartDoc
    #undef StartDoc

-   #ifdef __MINGW32__
+   #ifdef __GNUWIN32__

       #define DOCINFOW DOCINFO
       #define DOCINFOA DOCINFO
    #endif
       #define DOCINFOW DOCINFO
       #define DOCINFOA DOCINFO
    #endif


@@ -144,10 +148,28 @@
       return GetObjectW(h, i, buffer);
    #else
       return GetObjectA(h, i, buffer);
       return GetObjectW(h, i, buffer);
    #else
       return GetObjectA(h, i, buffer);

-   #endif   
+   #endif
+   }
+#endif
+
+
+#ifdef GetMessage
+   #undef GetMessage
+   inline int GetMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax)
+   {
+   #ifdef _UNICODE
+      return GetMessageW(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
+   #else
+      return GetMessageA(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
+   #endif

    }
 #endif
 
    }
 #endif
 

+// For WINE
+
+#if defined(GetWindowStyle) || defined(__WXWINE__)
+  #undef GetWindowStyle
+#endif

 
 // For ming and cygwin
 
 
 // For ming and cygwin
 


@@ -178,4 +200,5 @@
 //    #undef GetNextChild
 //endif
 
 //    #undef GetNextChild
 //endif
 

-#endif // _WX_WINUNDEF_H_
+// #endif // _WX_WINUNDEF_H_
+