reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/region.h b/include/wx/region.h
index 7ac65692774e8cb48def6554069123a98d06c920..3815353f1ebac5bd8c5be00db2ca68d3c591f142 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -1,13 +1,23 @@
-#ifndef __REGIONH_BASE__
-#define __REGIONH_BASE__
+#ifndef _WX_REGION_H_BASE_
+#define _WX_REGION_H_BASE_

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

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

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

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

 #endif
 
 #endif
 #endif
 
 #endif

-    // __REGIONH_BASE__
+    // _WX_REGION_H_BASE_