fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index 365a4a0575b634ec0a78777f5482ac189156164f..4d62415e98f70658f699237064d5660357ffca9b 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.h
+// Name:        wx/os2/brush.h

 // Purpose:     wxBrush class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxBrush class
 // Author:      David Webster
 // Modified by:


@@ -16,22 +16,29 @@
 #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:
 
 protected:

-    int                             m_nStyle;
-    wxBitmap                        m_vStipple ;
-    wxColour                        m_vColour;
-    WXHBRUSH                        m_hBrush; // in OS/2 GPI this will be the PS the pen is associated with
-    AREABUNDLE                      m_vBundle;
+    int         m_nStyle;
+    wxBitmap    m_vStipple ;
+    wxColour    m_vColour;
+    WXHBRUSH    m_hBrush; // in OS/2 GPI this will be the PS the pen is associated with
+    AREABUNDLE  m_vBundle;

 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)


@@ -43,22 +50,15 @@ class WXDLLEXPORT wxBrush: public wxBrushBase
 
 public:
     wxBrush();
 
 public:
     wxBrush();

-    wxBrush( const wxColour& rCol
-            ,int             nStyle = wxSOLID
-           );
+    wxBrush(const wxColour& rCol, int nStyle = wxSOLID);

     wxBrush(const wxBitmap& rStipple);
     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( unsigned char cRed
-                           ,unsigned char cGreen
-                           ,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);


@@ -68,8 +68,6 @@ 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) ; }
-

     //
     // Implementation
     //
     //
     // Implementation
     //


@@ -78,7 +76,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);