1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/brush.h b/include/wx/brush.h
index bc05548735c9c9b38b974815d62465feda6d648e..ce4cdccf7feadcbdba869e9fdc193118ea45522f 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -1,13 +1,21 @@
-#ifndef __BRUSHH_BASE__
-#define __BRUSHH_BASE__
+#ifndef _WX_BRUSH_H_BASE_
+#define _WX_BRUSH_H_BASE_
 
-#if defined(__WINDOWS__)
-#include "wx/msw/brush.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/brush.h"
-#elif defined(__GTK__)
-#include "wx/gtk/brush.h"
+#if 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(__WXMGL__)
+    #include "wx/mgl/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
-    // __BRUSHH_BASE__
+    // _WX_BRUSH_H_BASE_