Reworked the undef stuff a little

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/winundef.h

@@ -13,52 +13,163 @@
 #define _WX_WINUNDEF_H_
 
 // windows.h #defines the following identifiers which are also used in wxWin
+
+// GetCharWidth
+
 #ifdef GetCharWidth
     #undef GetCharWidth
 #endif
 
+inline BOOL  GetCharWidth(HDC dc, UINT first, UINT last, LPINT buffer)
+{
+#ifdef _UNICODE
+   return GetCharWidthW(dc, first, last, buffer);
+#else
+   return GetCharWidthA(dc, first, last, buffer);
+#endif
+}
+
+// FindWindow
+
 #ifdef FindWindow
     #undef FindWindow
 #endif
 
+#ifdef _UNICODE
+inline HWND FindWindow(LPCWSTR classname, LPCWSTR windowname)
+{
+   return FindWindowW(classname, windowname);
+}
+#else
+inline HWND FindWindow(LPCSTR classname, LPCSTR windowname)
+{
+   return FindWindowA(classname, windowname);
+}
+#endif
+
+// GetClassName
+
 #ifdef GetClassName
     #undef GetClassName
 #endif
 
+#ifdef _UNICODE
+inline int GetClassName(HWND h, LPWSTR classname, int maxcount)
+{
+   return GetClassNameW(h, classname, maxcount);
+}
+#else
+inline int GetClassName(HWND h, LPSTR classname, int maxcount)
+{
+   return GetClassNameA(h, classname, maxcount);
+}
+#endif
+
+// GetClassInfo
+
 #ifdef GetClassInfo
     #undef GetClassInfo
 #endif
 
+#ifdef _UNICODE
+inline BOOL GetClassInfo(HINSTANCE h, LPCWSTR name, LPWNDCLASSW winclass)
+{
+   return GetClassInfoW(h, name, winclass);
+}
+#else
+inline BOOL GetClassInfo(HINSTANCE h, LPCSTR name, LPWNDCLASSA winclass)
+{
+   return GetClassInfoA(h, name, winclass);
+}
+#endif
+
+// LoadAccelerators
+
 #ifdef LoadAccelerators
     #undef LoadAccelerators
 #endif
 
-#ifdef GetWindowProc
+#ifdef _UNICODE
-    #undef GetWindowProc
+inline HACCEL LoadAccelerators(HINSTANCE h, LPCWSTR name)
+{
+   return LoadAcceleratorsW(h, name);
+}
+#else
+inline HACCEL LoadAccelerators(HINSTANCE h, LPCSTR name)
+{
+   return LoadAcceleratorsA(h, name);
+}
 #endif
 
+
+// GetWindowProc... this isn't a Windows API function?!?!
+//ifdef GetWindowProc
+//   #undef GetWindowProc
+//endif
+
+
+// DrawText
+
 #ifdef DrawText
     #undef DrawText
 #endif
 
+#ifdef _UNICODE
+inline int DrawText(HDC h, LPCWSTR str, int count, LPRECT rect, UINT format)
+{
+   return DrawTextW(h, str, count, rect, format);
+}
+#else
+inline int DrawText(HDC h, LPCSTR str, int count, LPRECT rect, UINT format)
+{
+   return DrawTextA(h, str, count, rect, format);
+}
+#endif
+
+// StartDoc
+
 #ifdef StartDoc
     #undef StartDoc
 #endif
 
-#ifdef GetFirstChild
+#ifdef _UNICODE
-    #undef GetFirstChild
+inline int StartDoc(HDC h, CONST DOCINFOW* info)
+{
+   return StartDocW(h, info);
+}
+#else
+inline int StartDoc(HDC h, CONST DOCINFOA* info)
+{
+   return StartDocA(h, info);
+}
 #endif
 
-#ifdef GetNextChild
+// GetFirstChild... not a Windows API Function!?!?!
-    #undef GetNextChild
+//ifdef GetFirstChild
-#endif
+//   #undef GetFirstChild
+//endif
 
-#ifdef GetNextSibling
+//ifdef GetNextChild
-    #undef GetNextSibling
+//    #undef GetNextChild
-#endif
+//endif
+
+//ifdef GetNextSibling
+//    #undef GetNextSibling
+//endif
+
+// GetObject
 
 #ifdef GetObject
     #undef GetObject
 #endif
 
+inline int GetObject(HGDIOBJ h, int i, LPVOID buffer)
+{
+#ifdef _UNICODE
+   return GetObjectW(h, i, buffer);
+#else
+   return GetObjectA(h, i, buffer);
+#endif   
+}
+
 #endif // _WX_WINUNDEF_H_

include/wx/wxprec.h

@@ -26,45 +26,14 @@
 
 // include the wx definitions
 #ifdef WX_PRECOMP
+
+#ifdef __WXMSW__
+#include <windows.h>
+#include "wx/msw/winundef.h"
+#endif
+
 #include "wx/wx.h"
 
-// Comment this out if you don't mind slower compilation of the wxWindows
-// library
-#if !defined(__WXMAC__) && !defined(__SALFORDC__)
-#include <windows.h>
-#endif
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-#ifdef DrawText
-#undef DrawText
-#endif
-
-#ifdef GetCharWidth
-#undef GetCharWidth
-#endif
-
-#ifdef StartDoc
-#undef StartDoc
-#endif
-
-#ifdef FindWindow
-#undef FindWindow
-#endif
-
-#ifdef FindResource
-#undef FindResource
-#endif
-
-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif
 
 #endif // WX_PRECOMP