compilation fix for wxString::Format("no variadic arguments") and VC6

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

diff --git a/include/wx/brush.h b/include/wx/brush.h
index f29460b1c92ab6c1594c603f4e5b5cb0d3c92c72..0c862b7e756fc1bc6d080b63a1bd5117113c426b 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -1,15 +1,54 @@
-#ifndef __BRUSHH_BASE__
-#define __BRUSHH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// 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
+/////////////////////////////////////////////////////////////////////////////

 
 

-#if defined(__WXMSW__)
-#include "wx/msw/brush.h"
-#elif defined(__WXMOTIF__)
-#include "wx/xt/brush.h"
+#ifndef _WX_BRUSH_H_BASE_
+#define _WX_BRUSH_H_BASE_
+
+#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(__WXGTK20__)
+    #include "wx/gtk/brush.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/brush.h"
-#elif defined(__WXQT__)
-#include "wx/qt/brush.h"
+    #include "wx/gtk1/brush.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/brush.h"
+#elif defined(__WXDFB__)
+    #include "wx/dfb/brush.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/brush.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/brush.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/brush.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __BRUSHH_BASE__
+    // _WX_BRUSH_H_BASE_