removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere...

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

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 2352b224427561fa7fa6e8f25d22482304a4a7d6..ae8f784b802095a12754794b56de74f960b7b687 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_BRUSH_H__
 #define __WX_BRUSH_H__
 
 #ifndef __WX_BRUSH_H__
 #define __WX_BRUSH_H__
 

-#ifdef __GNUG__
-#pragma interface "brush.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -32,20 +27,18 @@ class WXDLLEXPORT wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
 // wxBrush
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBrush: public wxGDIObject
+class WXDLLEXPORT wxBrush: public wxBrushBase

 {
 public:
     wxBrush() {}
 {
 public:
     wxBrush() {}

-    wxBrush(const wxColour &colour, int style);
+    wxBrush(const wxColour &colour, int style = wxSOLID);

     wxBrush(const wxBitmap &stippleBitmap);
     wxBrush(const wxBitmap &stippleBitmap);

-    wxBrush(const wxBrush &brush);

     ~wxBrush() {}
     ~wxBrush() {}

-    wxBrush& operator = (const wxBrush& brush);

     bool operator == (const wxBrush& brush) const;
     bool operator != (const wxBrush& brush) const;
     bool Ok() const;
 
     bool operator == (const wxBrush& brush) const;
     bool operator != (const wxBrush& brush) const;
     bool Ok() const;
 

-    int GetStyle() const;
+    virtual int GetStyle() const;

     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 
     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 


@@ -53,7 +46,7 @@ public:
     void SetColour(unsigned char r, unsigned char g, unsigned char b);
     void SetStyle(int style);
     void SetStipple(const wxBitmap& stipple);
     void SetColour(unsigned char r, unsigned char g, unsigned char b);
     void SetStyle(int style);
     void SetStipple(const wxBitmap& stipple);

-    
+

     // implementation:
 
     void* GetMaskPattern() const;
     // implementation:
 
     void* GetMaskPattern() const;