SetTextColour is gone

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 900838c450d0861c550fe9f11fdf3037948b90dd..233016dc124002e5c2b2f340cdee65d3692ca48f 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -25,7 +25,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& rData);
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& rData);

-    ~wxPenRefData();
+    virtual ~wxPenRefData();

 
 protected:
     int                             m_nWidth;
 
 protected:
     int                             m_nWidth;


@@ -54,14 +54,15 @@ public:
     wxPen( const wxBitmap& rStipple
           ,int             nWidth
          );
     wxPen( const wxBitmap& rStipple
           ,int             nWidth
          );

-    ~wxPen();
+    virtual ~wxPen();

 
     inline bool   operator == (const wxPen& rPen) const
         { return m_refData == rPen.m_refData; }
     inline bool   operator != (const wxPen& rPen) const
         { return m_refData != rPen.m_refData; }
 
 
     inline bool   operator == (const wxPen& rPen) const
         { return m_refData == rPen.m_refData; }
     inline bool   operator != (const wxPen& rPen) const
         { return m_refData != rPen.m_refData; }
 

-    virtual bool Ok(void) const { return (m_refData != NULL); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk(void) const { return (m_refData != NULL); }

 
     //
     // Override in order to recreate the pen
 
     //
     // Override in order to recreate the pen


@@ -104,7 +105,7 @@ public:
     //
     bool     RealizeResource(void);
     bool     FreeResource(bool bForce = false);
     //
     bool     RealizeResource(void);
     bool     FreeResource(bool bForce = false);

-    WXHANDLE GetResourceHandle(void);
+    virtual WXHANDLE GetResourceHandle(void) const;

     bool     IsFree(void) const;
     void     Unshare(void);
 
     bool     IsFree(void) const;
     void     Unshare(void);