safe macro expansion

[wxWidgets.git] / include / wx / os2 / dc.h

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index debf4df06b5b6c97a0bb44f3b60098e0d03ddbc2..85d37c6593d2d496f5eab3bc720cdb07f8f7f314 100644 (file)
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -148,9 +148,17 @@ public:
         m_bOwnsDC = bOwnsDC;
     }
 
         m_bOwnsDC = bOwnsDC;
     }
 

+    HPS             GetHPS(void) const { return m_hPS; }
+    void            SetHPS(HPS hPS)
+    {
+        HDC                         hDC = ::GpiQueryDevice(hPS);
+        m_hPS = hPS;
+    }

     const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }
     wxBitmap&       GetSelectedBitmap(void) { return m_vSelectedBitmap; }
 
     const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }
     wxBitmap&       GetSelectedBitmap(void) { return m_vSelectedBitmap; }
 

+    void            UpdateClipBox();
+

 protected:
     virtual void DoFloodFill( wxCoord         vX
                              ,wxCoord         vY
 protected:
     virtual void DoFloodFill( wxCoord         vX
                              ,wxCoord         vY


@@ -281,9 +289,6 @@ protected:
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 

-#if wxUSE_SPLINES
-    virtual void DoDrawSpline(wxList* pPoints);
-#endif // wxUSE_SPLINES

 
     //
     // common part of DoDrawText() and DoDrawRotatedText()
 
     //
     // common part of DoDrawText() and DoDrawRotatedText()


@@ -316,11 +321,9 @@ public:
     bool                            m_bOwnsDC:1;
 
     //
     bool                            m_bOwnsDC:1;
 
     //

-    // our HDC and its usage count: we only free it when the usage count drops
-    // to 0
+    // our HDC

     //
     WXHDC                           m_hDC;
     //
     WXHDC                           m_hDC;

-    int                             m_nDCCount;

 
     //
     // Store all old GDI objects when do a SelectObject, so we can select them
 
     //
     // Store all old GDI objects when do a SelectObject, so we can select them