Moved deprecated code to source file (didn't compile

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index 71661f22776736f7d48852c0dda5fb6268ae5822..c37808f3ef6a837729f8f6df55add2039d692178 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -24,7 +24,14 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& rData);
 public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& rData);

-    ~wxBrushRefData();
+    virtual ~wxBrushRefData();
+
+    bool operator == (const wxBrushRefData& data) const
+    {
+        return (m_nStyle == data.m_nStyle &&
+                m_vStipple.IsSameAs(data.m_vStipple) &&
+                m_vColour == data.m_vColour);
+    }

 
 protected:
     int         m_nStyle;
 
 protected:
     int         m_nStyle;


@@ -45,15 +52,13 @@ public:
     wxBrush();
     wxBrush(const wxColour& rCol, int nStyle = wxSOLID);
     wxBrush(const wxBitmap& rStipple);
     wxBrush();
     wxBrush(const wxColour& rCol, int nStyle = wxSOLID);
     wxBrush(const wxBitmap& rStipple);

-    inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); }
-    ~wxBrush();
+    virtual ~wxBrush();

 
 

-    inline wxBrush& operator = (const wxBrush& rBrush) { if (*this == rBrush) return (*this); Ref(rBrush); return *this; }
-    inline bool operator == (const wxBrush& rBrush) const { return m_refData == rBrush.m_refData; }
-    inline bool operator != (const wxBrush& rBrush) const { return m_refData != rBrush.m_refData; }
+    bool operator == (const wxBrush& rBrush) const;
+    inline bool operator != (const wxBrush& rBrush) const { return !(*this == rBrush); }

 
     virtual void SetColour(const wxColour& rColour);
 
     virtual void SetColour(const wxColour& rColour);

-    virtual void SetColour(const unsigned char cRed, const unsigned char cGreen, const unsigned char cBrush);
+    virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);

     virtual void SetPS(HPS hPS);
     virtual void SetStyle(int nStyle)  ;
     virtual void SetStipple(const wxBitmap& rStipple);
     virtual void SetPS(HPS hPS);
     virtual void SetStyle(int nStyle)  ;
     virtual void SetStipple(const wxBitmap& rStipple);


@@ -63,7 +68,8 @@ public:
     inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); };
     inline int       GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); };
 
     inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); };
     inline int       GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); };
 

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

 
     //
     // Implementation
 
     //
     // Implementation


@@ -73,7 +79,7 @@ public:
     // Useful helper: create the brush resource
     //
     bool     RealizeResource(void);
     // Useful helper: create the brush resource
     //
     bool     RealizeResource(void);

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

     bool     FreeResource(bool bForce = false);
     bool     IsFree(void) const;
     void     Unshare(void);
     bool     FreeResource(bool bForce = false);
     bool     IsFree(void) const;
     void     Unshare(void);