setting focus explicitely when using showmodal

[wxWidgets.git] / include / wx / mac / carbon / brush.h

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index 6f915f9d8f29eb3cb5e2f283d600883fe5e5b8aa..d5c3e5be123db2b1867f72b04b09787b9e6629f4 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -30,7 +30,7 @@ typedef enum
 } wxMacBrushKind ;
 
 // Brush
-class WXDLLEXPORT wxBrush: public wxGDIObject
+class WXDLLEXPORT wxBrush: public wxBrushBase
 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 
@@ -40,7 +40,7 @@ public:
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBrush& brush)
-        : wxGDIObject()
+        : wxBrushBase()
         { Ref(brush); }
     ~wxBrush();
 
@@ -63,12 +63,9 @@ public:
     unsigned long MacGetThemeBackground(WXRECTPTR extent)  const ;
     short MacGetTheme()  const ;
     wxColour& GetColour() const ;
-    int GetStyle() const ;
+    virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
-    bool IsHatch() const
-        { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); }
-
     virtual bool Ok() const { return (m_refData != NULL) ; }
 
 // Implementation