fix warnings in EventsSuppressor ctor from gcc with -O option

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

diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index d3655e5146f6d802927fdcbe0c391109e6500db5..31db6fc5c45014517746bdf624e6f074ffdb0667 100644 (file)
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -16,7 +16,7 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;

 
 // ========================================================================
 // wxBrush
 
 // ========================================================================
 // wxBrush


@@ -31,23 +31,16 @@ public:
     wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);

-    wxBrush(const wxBrush& brush)
-    :   wxBrushBase()
-    {   Ref(brush); }
-    ~wxBrush();
+    virtual ~wxBrush();

 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
     virtual void SetColour(const wxColour& col) ;
 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
     virtual void SetColour(const wxColour& col) ;

-    virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;

     virtual void SetStyle(int style) ;
     virtual void SetStipple(const wxBitmap& stipple) ;
 
     virtual void SetStyle(int style) ;
     virtual void SetStipple(const wxBitmap& stipple) ;
 

-    // assignment
-    wxBrush& operator = (const wxBrush& brush)
-    {   if (*this == brush) return (*this); Ref(brush); return *this; }
-

     // comparison
     bool operator == (const wxBrush& brush) const
     {   return m_refData == brush.m_refData; }
     // comparison
     bool operator == (const wxBrush& brush) const
     {   return m_refData == brush.m_refData; }


@@ -59,7 +52,8 @@ public:
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 

-    virtual bool Ok() const
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const

     {   return (m_refData != NULL); }
 
     // wxObjectRefData
     {   return (m_refData != NULL); }
 
     // wxObjectRefData