Added C/wxString array constructors to wxArrayString

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

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index ccc307e1188d231e9f10edee67a2e9053d282ef7..782bc57f2d0ff6b205405df4813f447f6d088f18 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -12,7 +12,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
 


@@ -26,13 +26,13 @@ class WXDLLEXPORT wxBrush;
 // wxBrush
 // ----------------------------------------------------------------------------
 
 // wxBrush
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxBrush();
 {
 public:
     wxBrush();

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

     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBitmap& stipple);

-    wxBrush(const wxBrush& brush) { Ref(brush); }
+    wxBrush(const wxBrush& brush) : wxBrushBase(brush) { Ref(brush); }

     virtual ~wxBrush();
 
     virtual void SetColour(const wxColour& col);
     virtual ~wxBrush();
 
     virtual void SetColour(const wxColour& col);


@@ -45,13 +45,13 @@ public:
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;

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

     wxBitmap *GetStipple() const;
 
     bool Ok() const { return m_refData != NULL; }
 
     wxBitmap *GetStipple() const;
 
     bool Ok() const { return m_refData != NULL; }
 

-    // create (if necessary) and return the HBRUSH for this brush
-    WXHBRUSH GetResourceHandle() const;
+    // return the HBRUSH for this brush
+    virtual WXHANDLE GetResourceHandle() const;

 
 protected:
     virtual wxObjectRefData *CreateRefData() const;
 
 protected:
     virtual wxObjectRefData *CreateRefData() const;