X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3ab1c18017bb08329e73918f9f502ea00cdb447..3ac1094bead05e30462122d00e4859725d2ea59f:/include/wx/msw/pen.h?ds=inline diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 470d92c6dc..95c50c06ab 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -13,59 +13,7 @@ #define _WX_PEN_H_ #include "wx/gdiobj.h" -#include "wx/bitmap.h" -#include "wx/colour.h" - -typedef WXDWORD wxMSWDash; - -class WXDLLEXPORT wxPen; - -// VZ: this class should be made private -class WXDLLEXPORT wxPenRefData : public wxGDIRefData -{ -public: - wxPenRefData(); - wxPenRefData(const wxPenRefData& data); - virtual ~wxPenRefData(); - - bool operator==(const wxPenRefData& data) const - { - // we intentionally don't compare m_hPen fields here - return m_style == data.m_style && - m_width == data.m_width && - m_join == data.m_join && - m_cap == data.m_cap && - m_colour == data.m_colour && - (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) && - (m_style != wxUSER_DASH || - (m_nbDash == data.m_nbDash && - memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); - } - -protected: - int m_width; - int m_style; - int m_join; - int m_cap; - wxBitmap m_stipple; - int m_nbDash; - wxDash * m_dash; - wxColour m_colour; - WXHPEN m_hPen; - -private: - friend class WXDLLEXPORT wxPen; - - // Cannot use - // DECLARE_NO_COPY_CLASS(wxPenRefData) - // because copy constructor is explicitly declared above; - // but no copy assignment operator is defined, so declare - // it private to prevent the compiler from defining it: - wxPenRefData& operator=(const wxPenRefData&); -}; - -#define M_PENDATA ((wxPenRefData *)m_refData) -#define wxPENDATA(x) ((wxPenRefData *)(x).m_refData) +#include "wx/gdicmn.h" // ---------------------------------------------------------------------------- // Pen @@ -74,19 +22,12 @@ private: class WXDLLEXPORT wxPen : public wxGDIObject { public: - wxPen(); + wxPen() { } wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); - virtual ~wxPen(); - - bool operator==(const wxPen& pen) const - { - const wxPenRefData *penData = (wxPenRefData *)pen.m_refData; - - // an invalid pen is only equal to another invalid pen - return m_refData ? penData && *M_PENDATA == *penData : !penData; - } + virtual ~wxPen() { } + bool operator==(const wxPen& pen) const; bool operator!=(const wxPen& pen) const { return !(*this == pen); } virtual bool Ok() const { return IsOk(); } @@ -103,29 +44,29 @@ public: void SetJoin(int join); void SetCap(int cap); - wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }; - int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }; - int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; - int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; - int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; - int GetDashes(wxDash **ptr) const - { - *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_nbDash : 0); - } - wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); }; - inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }; + wxColour& GetColour() const; + int GetWidth() const; + int GetStyle() const; + int GetJoin() const; + int GetCap() const; + int GetDashes(wxDash** ptr) const; + wxDash* GetDash() const; + int GetDashCount() const; + wxBitmap* GetStipple() const; + + // internal: wxGDIObject methods + virtual bool RealizeResource(); + virtual bool FreeResource(bool force = false); + virtual WXHANDLE GetResourceHandle() const; + virtual bool IsFree() const; - inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }; +protected: + virtual wxObjectRefData* CreateRefData() const; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; - // Internal - bool RealizeResource(); - bool FreeResource(bool force = false); - WXHANDLE GetResourceHandle() const; - bool IsFree() const; - void Unshare(); + // same as FreeResource() + RealizeResource() + bool Recreate(); -private: DECLARE_DYNAMIC_CLASS(wxPen) };