Fixed context menu in wxRichTextCtrl

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

diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index 95629e88cbd0418485824ef805d2eed90af93ea8..ce581ab06d726ccadc5ef68879cf5e65e34ab9e3 100644 (file)
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -18,9 +18,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBrush;
-class WXDLLIMPEXP_CORE wxColour;
-class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 //-----------------------------------------------------------------------------
 // wxBrush
@@ -33,12 +33,10 @@ public:
 
     wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
-    ~wxBrush();
+    virtual ~wxBrush();
 
-    wxBrush( const wxBrush &brush ) { Ref(brush); }
-    wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
-
-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }
@@ -48,11 +46,11 @@ public:
     wxBitmap *GetStipple() const;
 
     void SetColour( const wxColour& col );
-    void SetColour( const unsigned char r, const unsigned char g, const unsigned char b );
+    void SetColour( unsigned char r, unsigned char g, unsigned char b );
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );
 
-private:
+protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;