X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/379a3b04b984e6ffcd67e4d408c0a8a315827d8f..ba059d80b40d7f1f249afa17b57d682f8b0e8b93:/include/wx/msw/winundef.h

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index c8a389bc89..ac2fa36577 100644
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -9,8 +9,12 @@
 // 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_
+ */
 
 // windows.h #defines the following identifiers which are also used in wxWin
 
@@ -117,6 +121,10 @@
 
 #ifdef StartDoc
    #undef StartDoc
+   #ifdef __GNUWIN32__
+      #define DOCINFOW DOCINFO
+      #define DOCINFOA DOCINFO
+   #endif
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {
@@ -140,11 +148,29 @@
       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
+
+// For WINE
+
+#if defined(GetWindowStyle) || defined(__WXWINE__)
+  #undef GetWindowStyle
+#endif
+
 // For ming and cygwin
 
 // GetFirstChild
@@ -159,11 +185,11 @@
 
 // GetNextSibling
 #ifdef GetNextSibling
-    #undef GetNextSibling
-    inline HWND GetNextSibling(HWND h)
-    {
-      return GetWindow(h, GW_HWNDNEXT);
-    }
+   #undef GetNextSibling
+   inline HWND GetNextSibling(HWND h)
+   {
+     return GetWindow(h, GW_HWNDNEXT);
+   }
 #endif
 
 // GetWindowProc
@@ -174,4 +200,5 @@
 //    #undef GetNextChild
 //endif
 
-#endif // _WX_WINUNDEF_H_
+// #endif // _WX_WINUNDEF_H_
+