Fixed Windows DLL link problems with wxHtmlProcessor

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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index e580f2465070e6e03dd274880b0da3bf979f3a88..3e6653c834c10e03e5b65c34c346a5b8fac5f3f5 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -128,19 +128,19 @@
 
 #ifdef StartDoc
    #undef StartDoc
-   #ifdef __GNUG__
+   #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 )
       #define DOCINFOW DOCINFO
       #define DOCINFOA DOCINFO
    #endif
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {
-      return StartDocW(h, info);
+      return StartDocW(h, (DOCINFOW*) info);
    }
    #else
    inline int StartDoc(HDC h, CONST DOCINFOA* info)
    {
-      return StartDocA(h, info);
+      return StartDocA(h, (DOCINFOA*) info);
    }
    #endif
 #endif
@@ -177,27 +177,33 @@
 
 #ifdef LoadLibrary
     #undef LoadLibrary
-    inline HINSTANCE LoadLibrary(LPCTSTR lpLibFileName)
-    {
     #ifdef _UNICODE
+    inline HINSTANCE LoadLibrary(LPCWSTR lpLibFileName)
+    {
         return LoadLibraryW(lpLibFileName);
+    }
     #else
+    inline HINSTANCE LoadLibrary(LPCSTR lpLibFileName)
+    {
         return LoadLibraryA(lpLibFileName);
-    #endif
     }
+    #endif
 #endif
 
 // FindResource
 #ifdef FindResource
     #undef FindResource
-    inline HRSRC FindResource(HMODULE hModule, LPCTSTR lpName, LPCTSTR lpType)
-    {
     #ifdef _UNICODE
+    inline HRSRC FindResource(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType)
+    {
         return FindResourceW(hModule, lpName, lpType);
+    }
     #else
+    inline HRSRC FindResource(HMODULE hModule, LPCSTR lpName, LPCSTR lpType)
+    {
         return FindResourceA(hModule, lpName, lpType);
-    #endif
     }
+    #endif
 #endif
 
 // IsMaximized