Define SQLUINTEGER

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

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 5d12600bad1b903dc98b18c1b17e691468d8f484..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$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -11,7 +11,7 @@
 #ifndef __WX_BRUSH_H__
 #define __WX_BRUSH_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "brush.h"
 #endif
 
@@ -32,11 +32,11 @@ class WXDLLEXPORT wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBrush: public wxGDIObject
+class WXDLLEXPORT wxBrush: public wxBrushBase
 {
 public:
     wxBrush() {}
-    wxBrush(const wxColour &colour, int style);
+    wxBrush(const wxColour &colour, int style = wxSOLID);
     wxBrush(const wxBitmap &stippleBitmap);
     wxBrush(const wxBrush &brush);
     ~wxBrush() {}
@@ -45,7 +45,7 @@ public:
     bool operator != (const wxBrush& brush) const;
     bool Ok() const;
 
-    int GetStyle() const;
+    virtual int GetStyle() 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);
-    
+
     // implementation:
 
-    void Unshare();
-    
     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)
 };