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
This commit is contained in:
parent
123343b372
commit
be2001fedd
@ -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);
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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__)
|
||||
|
@ -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
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user