added support for user-defined types to wxConfig (patch 1753875)

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index 877ee04e51853f44dd869ac5f3d707856a3b6d20..9743686938fd7c6619d05f02924fd376656f55cb 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -16,15 +16,22 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;

 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxBrush;
+    friend class WXDLLIMPEXP_FWD_CORE wxBrush;

 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,10 +52,10 @@ 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);

-    ~wxBrush();
+    virtual ~wxBrush();

 
 

-    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(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);
 
     virtual void SetColour(const wxColour& rColour);
     virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);


@@ -61,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


@@ -71,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);