Move column organizing code to ports, away from common code

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

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 2e46a0a9a478bea62b82c5e82f6278a2bc2130e5..e0bfc9ff5d0752c765a07a37b91fb9794ecc2b64 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -7,21 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_BRUSH_H_
+#define _WX_GTK_BRUSH_H_

 
 

-#ifndef __GTKBRUSHH__
-#define __GTKBRUSHH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;

 
 //-----------------------------------------------------------------------------
 // wxBrush
 
 //-----------------------------------------------------------------------------
 // wxBrush


@@ -34,14 +24,10 @@ public:
 
     wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
 
     wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );

-    ~wxBrush();
-
-    wxBrush( const wxBrush &brush )
-        : wxBrushBase()
-        { Ref(brush); }
-    wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
+    virtual ~wxBrush();

 
 

-    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); }
 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }


@@ -51,11 +37,11 @@ public:
     wxBitmap *GetStipple() const;
 
     void SetColour( const wxColour& col );
     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 );
 
     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;
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;


@@ -63,4 +49,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 

-#endif // __GTKBRUSHH__
+#endif // _WX_GTK_BRUSH_H_