X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85f6b408dfd796805b1c43718e69549506353ca7..2d6dd9c09e7084d402fc923d2f09d8b7158a1a04:/include/wx/gtk/region.h diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index 5eec88fe82..50aa865bd3 100644 --- a/include/wx/gtk/region.h +++ b/include/wx/gtk/region.h @@ -10,31 +10,13 @@ #ifndef _WX_GTK_REGION_H_ #define _WX_GTK_REGION_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - -#include "wx/list.h" #include "wx/gdiobj.h" #include "wx/gdicmn.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxRegion; - //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- -enum wxRegionContain -{ - wxOutRegion = 0, - wxPartRegion = 1, - wxInRegion = 2 -}; - // So far, for internal use only enum wxRegionOp { @@ -49,7 +31,7 @@ enum wxRegionOp // wxRegion // ---------------------------------------------------------------------------- -class wxRegion : public wxGDIObject +class WXDLLIMPEXP_CORE wxRegion : public wxGDIObject { public: wxRegion() { } @@ -82,17 +64,12 @@ public: Union(bmp, transColour, tolerance); } - ~wxRegion(); - - wxRegion( const wxRegion& region ) - : wxGDIObject() - { Ref(region); } - wxRegion& operator = ( const wxRegion& region ) { Ref(region); return *this; } + virtual ~wxRegion(); bool Ok() const { return m_refData != NULL; } - bool operator == ( const wxRegion& region ); - bool operator != ( const wxRegion& region ) { return !(*this == region); } + bool operator == ( const wxRegion& region ) const; + bool operator != ( const wxRegion& region ) const { return !(*this == region); } void Clear(); @@ -155,14 +132,14 @@ protected: void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); private: - DECLARE_DYNAMIC_CLASS(wxRegion); + DECLARE_DYNAMIC_CLASS(wxRegion) }; // ---------------------------------------------------------------------------- // wxRegionIterator: decomposes a region into rectangles // ---------------------------------------------------------------------------- -class wxRegionIterator: public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject { public: wxRegionIterator(); @@ -190,7 +167,7 @@ private: wxRegion m_region; private: - DECLARE_DYNAMIC_CLASS(wxRegionIterator); + DECLARE_DYNAMIC_CLASS(wxRegionIterator) };