Remove sm_cocoaDelegate singleton. We need per-instance data anyway so we

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

diff --git a/include/wx/brush.h b/include/wx/brush.h
index 9b8bdfe4c42dd5f5e41f213b5f0ea54bcf521f53..9d01935be2f7ad68abc7504617104b76bfc28d88 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -1,22 +1,49 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/brush.h
+// Purpose:     Includes platform-specific wxBrush file
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_BRUSH_H_BASE_
 #define _WX_BRUSH_H_BASE_
 
-#if defined(__WXMSW__)
-#include "wx/msw/brush.h"
-#elif defined(__WXMOTIF__)
-#include "wx/motif/brush.h"
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/gdiobj.h"
+
+// wxBrushBase
+class WXDLLEXPORT wxBrushBase: public wxGDIObject
+{
+public:
+    virtual ~wxBrushBase() { }
+
+    virtual int GetStyle() const = 0;
+
+    virtual bool IsHatch() const
+        { return (GetStyle()>=wxFIRST_HATCH) && (GetStyle()<=wxLAST_HATCH); }
+};
+
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/brush.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/brush.h"
+#elif defined(__WXMOTIF__) || defined(__WXX11__)
+    #include "wx/x11/brush.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/brush.h"
-#elif defined(__WXX11__)
-#include "wx/x11/brush.h"
+    #include "wx/gtk/brush.h"
 #elif defined(__WXMGL__)
-#include "wx/mgl/brush.h"
+    #include "wx/mgl/brush.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/brush.h"
+    #include "wx/mac/brush.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/brush.h"
 #elif defined(__WXPM__)
-#include "wx/os2/brush.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/brush.h"
+    #include "wx/os2/brush.h"
 #endif
 
 #endif