added wxDataViewModel::HasContainerColumns

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

diff --git a/include/wx/brush.h b/include/wx/brush.h
index ce4abb1a3b9138d856708f0f81c6cae2aa28bf99..0c862b7e756fc1bc6d080b63a1bd5117113c426b 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -1,6 +1,21 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
 #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
 {
 // wxBrushBase
 class WXDLLEXPORT wxBrushBase: public wxGDIObject
 {


@@ -13,16 +28,20 @@ public:
         { return (GetStyle()>=wxFIRST_HATCH) && (GetStyle()<=wxLAST_HATCH); }
 };
 
         { return (GetStyle()>=wxFIRST_HATCH) && (GetStyle()<=wxLAST_HATCH); }
 };
 

-#if defined(__PALMOS__)
+#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"
     #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__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/brush.h"
     #include "wx/gtk/brush.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/brush.h"

 #elif defined(__WXMGL__)
     #include "wx/mgl/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__)
 #elif defined(__WXMAC__)
     #include "wx/mac/brush.h"
 #elif defined(__WXCOCOA__)