Don't use wstring for MinGW versions that don't support it

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 075ce5f3a9f8b5b8cdc8e8769d51c2a1712810d0..41209beb7588cb5dd3a048a9b68fa8759404c537 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -21,9 +21,6 @@
     #include "wx/msw/microwin.h"
 #endif
 
     #include "wx/msw/microwin.h"
 #endif
 

-// Include fixes for MSLU:
-#include "wx/msw/mslu.h"
-

 #include "wx/log.h"
 
 class WXDLLEXPORT wxFont;
 #include "wx/log.h"
 
 class WXDLLEXPORT wxFont;


@@ -166,6 +163,7 @@ extern LONG APIENTRY _EXPORT
 // Intel, Visual Age.
 #if defined(__WXWINCE__)
     #define wxGetOSFHandle(fd) ((HANDLE)fd)
 // Intel, Visual Age.
 #if defined(__WXWINCE__)
     #define wxGetOSFHandle(fd) ((HANDLE)fd)

+    #define wxOpenOSFHandle(h, flags) ((int)wxPtrToUInt(h))

 #elif defined(__CYGWIN__)
     #define wxGetOSFHandle(fd) ((HANDLE)get_osfhandle(fd))
 #elif defined(__VISUALC__) \
 #elif defined(__CYGWIN__)
     #define wxGetOSFHandle(fd) ((HANDLE)get_osfhandle(fd))
 #elif defined(__VISUALC__) \


@@ -175,6 +173,8 @@ extern LONG APIENTRY _EXPORT
    || defined(__MINGW32__) \
    || (defined(__MWERKS__) && defined(__MSL__))
     #define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd))
    || defined(__MINGW32__) \
    || (defined(__MWERKS__) && defined(__MSL__))
     #define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd))

+    #define wxOpenOSFHandle(h, flags) (_open_osfhandle(wxPtrToUInt(h), flags))
+    #define wx_fdopen _fdopen

 #endif
 
 // close the handle in the class dtor
 #endif
 
 // close the handle in the class dtor


@@ -335,9 +335,7 @@ inline RECT wxGetWindowRect(HWND hwnd)
     RECT rect;
 
     if ( !::GetWindowRect(hwnd, &rect) )
     RECT rect;
 
     if ( !::GetWindowRect(hwnd, &rect) )

-    {

         wxLogLastError(_T("GetWindowRect"));
         wxLogLastError(_T("GetWindowRect"));

-    }

 
     return rect;
 }
 
     return rect;
 }


@@ -347,9 +345,7 @@ inline RECT wxGetClientRect(HWND hwnd)
     RECT rect;
 
     if ( !::GetClientRect(hwnd, &rect) )
     RECT rect;
 
     if ( !::GetClientRect(hwnd, &rect) )

-    {

         wxLogLastError(_T("GetClientRect"));
         wxLogLastError(_T("GetClientRect"));

-    }

 
     return rect;
 }
 
     return rect;
 }


@@ -591,9 +587,7 @@ public:
     {
         m_ptr = GlobalLock(hGlobal);
         if ( !m_ptr )
     {
         m_ptr = GlobalLock(hGlobal);
         if ( !m_ptr )

-        {

             wxLogLastError(_T("GlobalLock"));
             wxLogLastError(_T("GlobalLock"));

-        }

     }
 
     ~GlobalPtrLock()
     }
 
     ~GlobalPtrLock()


@@ -896,9 +890,9 @@ inline void *wxSetWindowUserData(HWND hwnd, void *data)
 
 // note that the casts to LONG_PTR here are required even on 32-bit machines
 // for the 64-bit warning mode of later versions of MSVC (C4311/4312)
 
 // note that the casts to LONG_PTR here are required even on 32-bit machines
 // for the 64-bit warning mode of later versions of MSVC (C4311/4312)

-inline void *wxGetWindowProc(HWND hwnd)
+inline WNDPROC wxGetWindowProc(HWND hwnd)

 {
 {

-    return (void *)(LONG_PTR)::GetWindowLong(hwnd, GWL_WNDPROC);
+    return (WNDPROC)(LONG_PTR)::GetWindowLong(hwnd, GWL_WNDPROC);

 }
 
 inline void *wxGetWindowUserData(HWND hwnd)
 }
 
 inline void *wxGetWindowUserData(HWND hwnd)