converted to 16 colors

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index c8a389bc899dd71dac588489357c564d3a8f0842..6af2f389ccb674df609449f3f2dc6f54df5f405a 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -9,10 +9,21 @@
 // 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 so
+// we replace these symbols with the corresponding inline functions and
+// undefine the macro.
+//
+// This looks quite ugly here but allows us to write clear (and correct!) code
+// elsewhere because the functions, unlike the macros, respect the scope.
+// ----------------------------------------------------------------------------

 
 // GetCharWidth
 
 
 // GetCharWidth
 


@@ -117,6 +128,10 @@
 
 #ifdef StartDoc
    #undef StartDoc
 
 #ifdef StartDoc
    #undef StartDoc

+   #ifdef __GNUWIN32__
+      #define DOCINFOW DOCINFO
+      #define DOCINFOA DOCINFO
+   #endif

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


@@ -140,10 +155,43 @@
       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
 
    }
 #endif
 

+// GetMessage
+
+#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
+
+// LoadLibrary
+
+#ifdef LoadLibrary
+    #undef LoadLibrary
+    inline HINSTANCE LoadLibrary(LPCTSTR lpLibFileName)
+    {
+    #ifdef _UNICODE
+        return LoadLibraryW(lpLibFileName);
+    #else
+        return LoadLibraryA(lpLibFileName);
+    #endif
+    }
+#endif
+
+// For WINE
+
+#if defined(GetWindowStyle) || defined(__WXWINE__)
+  #undef GetWindowStyle
+#endif

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


@@ -159,11 +207,11 @@
 
 // GetNextSibling
 #ifdef GetNextSibling
 
 // 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
 #endif
 
 // GetWindowProc


@@ -174,4 +222,5 @@
 //    #undef GetNextChild
 //endif
 
 //    #undef GetNextChild
 //endif
 

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