first character of a command in a make rule must be TAB (not space or #): fixes build...

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

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 7787c2c407b14fdc44d351ff70eb62eac6170600..f9ac95c4f18beb02b7baaf5bff431309e0912152 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -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__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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,7 +27,7 @@ class WXDLLEXPORT wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
 // wxBrush
 //-----------------------------------------------------------------------------
 

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

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


@@ -45,7 +40,7 @@ public:
     bool operator != (const wxBrush& brush) const;
     bool Ok() 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 +48,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;