Unrevert Cygwin changes after discussion. Cygwin will be unix with the new

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

diff --git a/include/wx/region.h b/include/wx/region.h
index fc75ad05eb20fcc905be09b4ab6cd7ff113a8e74..425e8198fe919e7e1289f9ec933ce401f13529c1 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -1,20 +1,35 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/region.h
+// Purpose:     Base header for wxRegion
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_REGION_H_BASE_
 #define _WX_REGION_H_BASE_
 
 #ifndef _WX_REGION_H_BASE_
 #define _WX_REGION_H_BASE_
 

-#if defined(__WXMSW__)
-#include "wx/msw/region.h"
-#elif defined(__WXMOTIF__)
-#include "wx/motif/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"
+    #include "wx/gtk/region.h"
+#elif defined(__WXMOTIF__) || defined(__WXX11__)
+    #include "wx/x11/region.h"

 #elif defined(__WXMGL__)
 #elif defined(__WXMGL__)

-#include "wx/mgl/region.h"
+    #include "wx/mgl/region.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/region.h"
+    #include "wx/mac/region.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/region.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/region.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/region.h"
+    #include "wx/os2/region.h"

 #endif
 
 #endif
 #endif
 
 #endif