Wrap <commdlgs.h> as <commctls.h>. Required makefiles rebuilded.

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

diff --git a/include/wx/mac/classic/brush.h b/include/wx/mac/classic/brush.h
index c410e26d8bd02585155e90877254e1a6d34cc68a..9406bd4a72523cfade3c504d552e41bd94fa9fa4 100644 (file)
--- a/include/wx/mac/classic/brush.h
+++ b/include/wx/mac/classic/brush.h
@@ -30,7 +30,7 @@ typedef enum
 } wxMacBrushKind ;
 
 // Brush
 } wxMacBrushKind ;
 
 // Brush

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

 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 
 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 


@@ -40,7 +40,7 @@ public:
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBrush& brush)
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBrush& brush)

-        : wxGDIObject()
+        : wxBrushBase()

         { Ref(brush); }
     ~wxBrush();
 
         { Ref(brush); }
     ~wxBrush();
 


@@ -63,12 +63,9 @@ public:
     unsigned long GetMacThemeBackground(WXRECTPTR extent)  const ;
     short GetMacTheme()  const ;
     wxColour& GetColour() const ;
     unsigned long GetMacThemeBackground(WXRECTPTR extent)  const ;
     short GetMacTheme()  const ;
     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); }
-

     virtual bool Ok() const { return (m_refData != NULL) ; }
 
 // Implementation
     virtual bool Ok() const { return (m_refData != NULL) ; }
 
 // Implementation