Adjust to different platform headers distributed with DMC (build fix after recent...

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

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 1c4a29198f0d2556cbef3bf6c7207ef317c5a5d6..7f7ab1a23979589820b4dea1dff264d7abc956a3 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -11,7 +11,7 @@
 #ifndef __WX_BRUSH_H__
 #define __WX_BRUSH_H__
 
 #ifndef __WX_BRUSH_H__
 #define __WX_BRUSH_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "brush.h"
 #endif
 
 #pragma interface "brush.h"
 #endif
 


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

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

 {
 public:
 {
 public:

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

     wxBrush(const wxBitmap &stippleBitmap);
     wxBrush(const wxBrush &brush);
     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;
 
     wxBrush& operator = (const wxBrush& brush);
     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,14 +53,17 @@ 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:
 
     // implementation:
 

-    void Unshare();
-    

     void* GetMaskPattern() const;
     void* GetPixPattern() const;
 
     void* GetMaskPattern() const;
     void* GetPixPattern() const;
 

+protected:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };