reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/brush.h b/include/wx/brush.h
index fd7657e4d6c73945c04037db8de7109e94184911..9b8bdfe4c42dd5f5e41f213b5f0ea54bcf521f53 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -1,13 +1,23 @@
-#ifndef __BRUSHH_BASE__
-#define __BRUSHH_BASE__
+#ifndef _WX_BRUSH_H_BASE_
+#define _WX_BRUSH_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/brush.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/brush.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/brush.h"
+#include "wx/motif/brush.h"

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

+#elif defined(__WXX11__)
+#include "wx/x11/brush.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/brush.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/brush.h"
+#elif defined(__WXPM__)
+#include "wx/os2/brush.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/brush.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __BRUSHH_BASE__
+    // _WX_BRUSH_H_BASE_