X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7aa920b5a52e59e7e9cb4c0b9af6697fb79a4a1a..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/include/wx/os2/pen.h diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index 151aef8118..30aed3bbe4 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -17,11 +17,11 @@ typedef long wxPMDash; -class WXDLLEXPORT wxPen; +class WXDLLIMPEXP_FWD_CORE wxPen; class WXDLLEXPORT wxPenRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxPen; + friend class WXDLLIMPEXP_FWD_CORE wxPen; public: wxPenRefData(); wxPenRefData(const wxPenRefData& rData); @@ -58,7 +58,6 @@ protected: // Pen class WXDLLEXPORT wxPen : public wxGDIObject { - DECLARE_DYNAMIC_CLASS(wxPen) public: wxPen(); wxPen( const wxColour& rColour @@ -81,9 +80,6 @@ public: inline bool operator != (const wxPen& rPen) const { return !(*this == rPen); } - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk(void) const { return (m_refData != NULL); } - // // Override in order to recreate the pen // @@ -127,11 +123,19 @@ public: bool FreeResource(bool bForce = false); virtual WXHANDLE GetResourceHandle(void) const; bool IsFree(void) const; - void Unshare(void); private: LINEBUNDLE m_vLineBundle; AREABUNDLE m_vAreaBundle; + +protected: + virtual wxGDIRefData* CreateGDIRefData() const; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; + + // same as FreeResource() + RealizeResource() + bool Recreate(); + + DECLARE_DYNAMIC_CLASS(wxPen) }; // end of CLASS wxPen extern int wx2os2PenStyle(int nWxStyle);