X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..4658c44ec233e09db6f108f1ce01f06708907dd7:/include/wx/msw/pen.h diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 5bf73b0205..1cf0f4266c 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -17,8 +17,9 @@ #endif #include "wx/gdiobj.h" +#include "wx/bitmap.h" -typedef WXDWORD wxDash ; +typedef WXDWORD wxMSWDash; class WXDLLEXPORT wxPen; @@ -26,8 +27,9 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData { friend class WXDLLEXPORT wxPen; public: - wxPenRefData(void); - ~wxPenRefData(void); + wxPenRefData(); + wxPenRefData(const wxPenRefData& data); + ~wxPenRefData(); protected: int m_width; @@ -36,7 +38,7 @@ protected: int m_cap ; wxBitmap m_stipple ; int m_nbDash ; - wxDash * m_dash ; + wxMSWDash * m_dash ; wxColour m_colour; WXHPEN m_hPen; }; @@ -48,24 +50,21 @@ class WXDLLEXPORT wxPen: public wxGDIObject { DECLARE_DYNAMIC_CLASS(wxPen) public: - wxPen(void); + wxPen(); wxPen(const wxColour& col, int width, int style); - wxPen(const wxString& col, int width, int style); wxPen(const wxBitmap& stipple, int width); inline wxPen(const wxPen& pen) { Ref(pen); } - inline wxPen(const wxPen* pen) { /* UnRef(); */ if (pen) Ref(*pen); } - ~wxPen(void); + ~wxPen(); inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; } - inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; } - inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; } + inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; } + inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; } - virtual bool Ok(void) const { return (m_refData != NULL) ; } + virtual bool Ok() const { return (m_refData != NULL) ; } // Override in order to recreate the pen void SetColour(const wxColour& col) ; - void SetColour(const wxString& col) ; - void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ; + void SetColour(unsigned char r, unsigned char g, unsigned char b); void SetWidth(int width) ; void SetStyle(int style) ; @@ -74,22 +73,25 @@ public: void SetJoin(int join) ; void SetCap(int cap) ; - inline wxColour& GetColour(void) const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }; - inline int GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_width : 0); }; - inline int GetStyle(void) const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; - inline int GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; - inline int GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; - inline int GetDashes(wxDash **ptr) const { - *ptr = (M_PENDATA ? M_PENDATA->m_dash : NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); + inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }; + inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }; + inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; + inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; + inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; + inline int GetDashes(wxDash **ptr) const + { + *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); + return (M_PENDATA ? M_PENDATA->m_nbDash : 0); } - inline wxBitmap *GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); }; + inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }; // Internal - bool RealizeResource(void); + bool RealizeResource(); bool FreeResource(bool force = FALSE); - WXHANDLE GetResourceHandle(void) ; - bool IsFree(void); + WXHANDLE GetResourceHandle() ; + bool IsFree() const; + void Unshare(); }; int wx2msPenStyle(int wx_style);