oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/include/wx/region.h b/include/wx/region.h
index c076b5a5c26b30abecbb8fd7f44227addd252858..7dad80a147649f1c4c19f78d9d4d3c3584495e82 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -1,15 +1,25 @@
-#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__)
-#include "wx/xt/region.h"
+#include "wx/colour.h"
+
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/region.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/region.h"

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

-#include "wx/gtk/region.h"
-#elif defined(__WXQT__)
-#include "wx/qt/region.h"
+    #include "wx/gtk/region.h"
+#elif defined(__WXMOTIF__) || 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(__WXCOCOA__)
+    #include "wx/cocoa/region.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/region.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __REGIONH_BASE__
+    // _WX_REGION_H_BASE_