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

diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h
index 3498ffec641b1ad7af110776f302debefa22e798..d8da3a0eab4da8db3f95b192b3da36bc0c710af8 100644 (file)
--- 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 80eca895364e1c65bb83377f171fe86c279b4eac..c8136c7adb14301eb6a3bd6c3ae189edf4720e5a 100644 (file)
--- 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 217b37195f03ceb40d241d47898c059e81d92b88..12a5b207bf4f397f2d5c60c46bd03a97f45ed856 100644 (file)
--- 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 7bc3b81b4460d03ff829d7c21cb005238ff301c1..0386a8578353a3c387138b75089b3352860cef5b 100644 (file)
--- 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 d6cac7c66725b1aec4a8ec0f4a0d2e66beb22887..b26a996c087ee56e523e66c31a9094e17ac8c24f 100644 (file)
--- 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 d0b54162b4759c929c4f5ec083e9d643dae3c5dc..b19dfd045da0fbf3fd71595423c1e10c50bc27d2 100644 (file)
--- 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 c489ecfe06de52ad7c39b7c40122659f94f3c049..31af0202bec05cf9a4af5d119d7f6abe45986121 100644 (file)
--- 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 15cd749a7f9204ce282ba0aa3bc72c347b2fb421..54e1bb5e785beb6766294e4cf19c95269eb28d92 100644 (file)
--- 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 2dc28ecca0f0089025a95ac21c62ae11271b68ee..73b4b2f8c2deadcaed445d508685cd931423db65 100644 (file)
--- 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
 {