account for scroll offset correctly in the mouse event handler

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

diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index 4bf3d8a71b8fa2e58ef27846717ee62b9fa96306..47970da8cc228faa29df29cf4ebf0ac01f8d2146 100644 (file)
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -16,12 +16,12 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 // ========================================================================
 // wxBrush
 // ========================================================================
-class WXDLLEXPORT wxBrush: public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 // ------------------------------------------------------------------------
@@ -29,7 +29,10 @@ class WXDLLEXPORT wxBrush: public wxBrushBase
 // ------------------------------------------------------------------------
 public:
     wxBrush();
-    wxBrush(const wxColour& col, int style = wxSOLID);
+    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
 
@@ -38,7 +41,7 @@ public:
 // ------------------------------------------------------------------------
     virtual void SetColour(const wxColour& col) ;
     virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
-    virtual void SetStyle(int style) ;
+    virtual void SetStyle(wxBrushStyle style) ;
     virtual void SetStipple(const wxBitmap& stipple) ;
 
     // comparison
@@ -49,19 +52,20 @@ public:
 
     // accessors
     wxColour GetColour() const;
-    virtual int GetStyle() const;
+    virtual wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const
-    {   return (m_refData != NULL); }
-
-    // wxObjectRefData
-    wxObjectRefData *CreateRefData() const;
-    wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
 
     // wxCocoa
     WX_NSColor GetNSColor();
+
+protected:
+    wxGDIRefData *CreateGDIRefData() const;
+    wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 };
 
 #endif // __WX_COCOA_BRUSH_H__