enabling alpha on msw colour

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

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index d034e59cd4120a294704346414c260ea884c0385..4a83d7b57d678626b81d518ad9ed3ac1d145dd32 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -12,10 +12,6 @@
 #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/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"


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

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

 {
 public:
     wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
 {
 public:
     wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);

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

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


@@ -40,17 +35,13 @@ public:
     virtual void SetStyle(int style);
     virtual void SetStipple(const wxBitmap& stipple);
 
     virtual void SetStyle(int style);
     virtual void SetStipple(const wxBitmap& stipple);
 

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

     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;

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

     wxBitmap *GetStipple() const;
 
     wxBitmap *GetStipple() const;
 

-    bool IsHatch() const
-        { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); }
-

     bool Ok() const { return m_refData != NULL; }
 
     // return the HBRUSH for this brush
     bool Ok() const { return m_refData != NULL; }
 
     // return the HBRUSH for this brush