X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b6dbb09746f8f5ee0549a2ff39ae0ac4c725898..7c0ea335c7b1aa4ebd8b3a79dfb4be9fb20eefdb:/include/wx/motif/pen.h?ds=sidebyside diff --git a/include/wx/motif/pen.h b/include/wx/motif/pen.h index ea8e8079fb..4bc54d41b7 100644 --- a/include/wx/motif/pen.h +++ b/include/wx/motif/pen.h @@ -20,7 +20,7 @@ #include "wx/colour.h" #include "wx/bitmap.h" -typedef long wxDash ; +typedef char wxDash ; class WXDLLEXPORT wxPen; @@ -41,9 +41,6 @@ protected: int m_nbDash ; wxDash * m_dash ; wxColour m_colour; -/* TODO: implementation - WXHPEN m_hPen; -*/ }; #define M_PENDATA ((wxPenRefData *)m_refData) @@ -55,10 +52,8 @@ class WXDLLEXPORT wxPen: public wxGDIObject public: 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) { if (pen) Ref(*pen); } ~wxPen(); inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; } @@ -69,8 +64,7 @@ public: // 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) ; @@ -87,6 +81,8 @@ public: inline int GetDashes(wxDash **ptr) const { *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); } + inline int GetDashCount() const { return (M_PENDATA->m_nbDash); } + inline wxDash* GetDash() const { return (M_PENDATA->m_dash); } inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };