compilation fix for Borland C++

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index c1b5e3e4cf4accdeb3f31ccff33b98a6c6579499..262fc9ff80520d9a7661f237aac0fd63797c7826 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -21,14 +21,11 @@
     #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"
 
 #include "wx/log.h"
 

-class WXDLLEXPORT wxFont;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindowBase;

 
 // ---------------------------------------------------------------------------
 // private constants
 
 // ---------------------------------------------------------------------------
 // private constants


@@ -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;
 }


@@ -410,29 +406,49 @@ private:
 // dtor
 class SelectInHDC
 {
 // dtor
 class SelectInHDC
 {

+private:
+    void DoInit(HGDIOBJ hgdiobj) { m_hgdiobj = ::SelectObject(m_hdc, hgdiobj); }
+

 public:
 public:

-    SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc)
-        { m_hgdiobj = ::SelectObject(hdc, hgdiobj); }
+    SelectInHDC() : m_hdc(NULL) { }
+    SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc) { DoInit(hgdiobj); }

 
 

-   ~SelectInHDC() { ::SelectObject(m_hdc, m_hgdiobj); }
+    void Init(HDC hdc, HGDIOBJ hgdiobj)
+    {
+        wxASSERT_MSG( !m_hdc, _T("initializing twice?") );

 
 

-   // return true if the object was successfully selected
-   operator bool() const { return m_hgdiobj != 0; }
+        m_hdc = hdc;
+
+        DoInit(hgdiobj);
+    }
+
+    ~SelectInHDC() { if ( m_hdc ) ::SelectObject(m_hdc, m_hgdiobj); }
+
+    // return true if the object was successfully selected
+    operator bool() const { return m_hgdiobj != 0; }

 
 private:
 
 private:

-   HDC m_hdc;
-   HGDIOBJ m_hgdiobj;
+    HDC m_hdc;
+    HGDIOBJ m_hgdiobj;

 
 

-   DECLARE_NO_COPY_CLASS(SelectInHDC)
+    DECLARE_NO_COPY_CLASS(SelectInHDC)

 };
 
 // a class which cleans up any GDI object
 class AutoGDIObject
 {
 protected:
 };
 
 // a class which cleans up any GDI object
 class AutoGDIObject
 {
 protected:

+    AutoGDIObject() { m_gdiobj = NULL; }

     AutoGDIObject(HGDIOBJ gdiobj) : m_gdiobj(gdiobj) { }
     ~AutoGDIObject() { if ( m_gdiobj ) ::DeleteObject(m_gdiobj); }
 
     AutoGDIObject(HGDIOBJ gdiobj) : m_gdiobj(gdiobj) { }
     ~AutoGDIObject() { if ( m_gdiobj ) ::DeleteObject(m_gdiobj); }
 

+    void InitGdiobj(HGDIOBJ gdiobj)
+    {
+        wxASSERT_MSG( !m_gdiobj, _T("initializing twice?") );
+
+        m_gdiobj = gdiobj;
+    }
+

     HGDIOBJ GetObject() const { return m_gdiobj; }
 
 private:
     HGDIOBJ GetObject() const { return m_gdiobj; }
 
 private:


@@ -441,7 +457,7 @@ private:
 
 // TODO: all this asks for using a AutoHandler<T, CreateFunc> template...
 
 
 // TODO: all this asks for using a AutoHandler<T, CreateFunc> template...
 

-// a class for temporary pens
+// a class for temporary brushes

 class AutoHBRUSH : private AutoGDIObject
 {
 public:
 class AutoHBRUSH : private AutoGDIObject
 {
 public:


@@ -451,6 +467,22 @@ public:
     operator HBRUSH() const { return (HBRUSH)GetObject(); }
 };
 
     operator HBRUSH() const { return (HBRUSH)GetObject(); }
 };
 

+// a class for temporary fonts
+class AutoHFONT : private AutoGDIObject
+{
+private:
+public:
+    AutoHFONT()
+        : AutoGDIObject() { }
+
+    AutoHFONT(const LOGFONT& lf)
+        : AutoGDIObject(::CreateFontIndirect(&lf)) { }
+
+    void Init(const LOGFONT& lf) { InitGdiobj(::CreateFontIndirect(&lf)); }
+
+    operator HFONT() const { return (HFONT)GetObject(); }
+};
+

 // a class for temporary pens
 class AutoHPEN : private AutoGDIObject
 {
 // a class for temporary pens
 class AutoHPEN : private AutoGDIObject
 {


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

-        {

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

-        }

     }
 
     ~GlobalPtrLock()
     }
 
     ~GlobalPtrLock()


@@ -662,7 +692,7 @@ public:
     {
         if ( IsRegistered() )
         {
     {
         if ( IsRegistered() )
         {

-            if ( !::UnregisterClass(m_clsname, wxhInstance) )
+            if ( !::UnregisterClass(m_clsname.wx_str(), wxhInstance) )

             {
                 wxLogLastError(_T("UnregisterClass"));
             }
             {
                 wxLogLastError(_T("UnregisterClass"));
             }


@@ -794,7 +824,8 @@ enum wxWinVersion
     wxWinVersion_2003 = 0x0502,
 
     wxWinVersion_6 = 0x0600,
     wxWinVersion_2003 = 0x0502,
 
     wxWinVersion_6 = 0x0600,

-    wxWinVersion_NT6 = 0x0600
+    wxWinVersion_Vista = wxWinVersion_6,
+    wxWinVersion_NT6 = wxWinVersion_6

 };
 
 WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
 };
 
 WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();