Apply patch [ 1548750 ] wxVsnprintf() various fixes

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

diff --git a/include/wx/region.h b/include/wx/region.h
index ee0fd6ac06f761f0b054445a9a7057324db4082d..3582ecab1cc4f4fbb4a3d764109f262f75ed3f21 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -1,20 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
-#if defined(__WXMSW__)
-#include "wx/msw/region.h"
-#elif defined(__WXMOTIF__)
-#include "wx/motif/region.h"
+#include "wx/colour.h"
+
+enum wxRegionContain
+{
+    wxOutRegion = 0,
+    wxPartRegion = 1,
+    wxInRegion = 2
+};
+
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/region.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/region.h"
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/region.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/region.h"
-#elif defined(__WXQT__)
-#include "wx/qt/region.h"
+    #include "wx/gtk1/region.h"
+#elif defined(__WXMOTIF__) || defined(__WXX11__)
+    #include "wx/x11/region.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/region.h"
+#elif defined(__WXDFB__)
+    #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/region.h"
+    #include "wx/mac/region.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/region.h"
 #elif defined(__WXPM__)
-#include "wx/os2/region.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/region.h"
+    #include "wx/os2/region.h"
 #endif
 
 #endif