From be2001feddfb5f388c61a5a6f64146f0193e239b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Thu, 10 Aug 2006 14:26:55 +0000
Subject: [PATCH] moved duplicated wxRegionContain definitions to wx/region.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/region.h | 6 ------
 include/wx/gtk/region.h     | 7 -------
 include/wx/gtk1/region.h    | 7 -------
 include/wx/mgl/region.h     | 7 -------
 include/wx/msw/region.h     | 7 -------
 include/wx/os2/region.h     | 4 ----
 include/wx/palmos/region.h  | 7 -------
 include/wx/region.h         | 7 +++++++
 include/wx/x11/region.h     | 7 -------
 9 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h
index 3498ffec64..d8da3a0eab 100644
--- a/include/wx/generic/region.h
+++ b/include/wx/generic/region.h
@@ -18,12 +18,6 @@
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
-enum wxRegionContain
-{   wxOutRegion = 0
-,   wxPartRegion = 1
-,   wxInRegion = 2
-};
-
 class WXDLLEXPORT wxRegionGeneric : public wxGDIObject
 {
 //    DECLARE_DYNAMIC_CLASS(wxRegionGeneric);
diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 80eca89536..c8136c7adb 100644
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -24,13 +24,6 @@ class WXDLLIMPEXP_CORE wxRegion;
 // constants
 //-----------------------------------------------------------------------------
 
-enum wxRegionContain
-{
-    wxOutRegion = 0,
-    wxPartRegion = 1,
-    wxInRegion = 2
-};
-
 // So far, for internal use only
 enum wxRegionOp
 {
diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 217b37195f..12a5b207bf 100644
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -24,13 +24,6 @@ class WXDLLIMPEXP_CORE wxRegion;
 // constants
 //-----------------------------------------------------------------------------
 
-enum wxRegionContain
-{
-    wxOutRegion = 0,
-    wxPartRegion = 1,
-    wxInRegion = 2
-};
-
 // So far, for internal use only
 enum wxRegionOp
 {
diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h
index 7bc3b81b44..0386a85783 100644
--- a/include/wx/mgl/region.h
+++ b/include/wx/mgl/region.h
@@ -19,13 +19,6 @@ class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 class MGLRegion;
 
-enum wxRegionContain
-{
-    wxOutRegion = 0,
-    wxPartRegion = 1,
-    wxInRegion = 2
-};
-
 class WXDLLEXPORT wxRegion : public wxGDIObject
 {
     DECLARE_DYNAMIC_CLASS(wxRegion);
diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index d6cac7c667..b26a996c08 100644
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -18,13 +18,6 @@
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
-enum wxRegionContain
-{
-    wxOutRegion = 0,
-    wxPartRegion = 1,
-    wxInRegion = 2
-};
-
 // So far, for internal use only
 enum wxRegionOp
 {
diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index d0b54162b4..b19dfd045d 100644
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -21,10 +21,6 @@
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
-enum wxRegionContain {
-    wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
-};
-
 // So far, for internal use only
 enum wxRegionOp { wxRGN_AND         // Creates the intersection of the two combined regions.
                  ,wxRGN_COPY         // Creates a copy of the region identified by hrgnSrc1.
diff --git a/include/wx/palmos/region.h b/include/wx/palmos/region.h
index c489ecfe06..31af0202be 100644
--- a/include/wx/palmos/region.h
+++ b/include/wx/palmos/region.h
@@ -18,13 +18,6 @@
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
-enum wxRegionContain
-{
-    wxOutRegion = 0,
-    wxPartRegion = 1,
-    wxInRegion = 2
-};
-
 // So far, for internal use only
 enum wxRegionOp
 {
diff --git a/include/wx/region.h b/include/wx/region.h
index 15cd749a7f..54e1bb5e78 100644
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -14,6 +14,13 @@
 
 #include "wx/colour.h"
 
+enum wxRegionContain
+{
+    wxOutRegion = 0,
+    wxPartRegion = 1,
+    wxInRegion = 2
+};
+
 #if defined(__WXPALMOS__)
     #include "wx/palmos/region.h"
 #elif defined(__WXMSW__)
diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h
index 2dc28ecca0..73b4b2f8c2 100644
--- a/include/wx/x11/region.h
+++ b/include/wx/x11/region.h
@@ -26,13 +26,6 @@ class WXDLLIMPEXP_CORE wxRegion;
 // constants
 //-----------------------------------------------------------------------------
 
-enum wxRegionContain
-{
-    wxOutRegion = 0,
-    wxPartRegion = 1,
-    wxInRegion = 2
-};
-
 // So far, for internal use only
 enum wxRegionOp
 {