X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85f6b408dfd796805b1c43718e69549506353ca7..c5ce3dfb1efd5346682809f3d2702fd9c4edd52d:/include/wx/x11/region.h?ds=sidebyside diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h index 6d25a33e0d..2dc28ecca0 100644 --- a/include/wx/x11/region.h +++ b/include/wx/x11/region.h @@ -12,10 +12,6 @@ #ifndef _WX_REGION_H_ #define _WX_REGION_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "region.h" -#endif - #include "wx/list.h" #include "wx/gdiobj.h" #include "wx/gdicmn.h" @@ -24,7 +20,7 @@ // classes //----------------------------------------------------------------------------- -class wxRegion; +class WXDLLIMPEXP_CORE wxRegion; //----------------------------------------------------------------------------- // constants @@ -51,7 +47,7 @@ enum wxRegionOp // wxRegion // ---------------------------------------------------------------------------- -class wxRegion : public wxGDIObject +class WXDLLIMPEXP_CORE wxRegion : public wxGDIObject { public: wxRegion() { } @@ -86,13 +82,10 @@ public: ~wxRegion(); - wxRegion( const wxRegion& region ) { Ref(region); } - wxRegion& operator = ( const wxRegion& region ) { Ref(region); return *this; } - 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(); @@ -151,14 +144,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(); @@ -186,7 +179,7 @@ private: wxRegion m_region; private: - DECLARE_DYNAMIC_CLASS(wxRegionIterator); + DECLARE_DYNAMIC_CLASS(wxRegionIterator) }; #endif