X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..e10972f6c1436a6dcd5427b4e3913bb0f398e045:/include/wx/gtk1/pen.h diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index 01191d0324..724b9b7920 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -23,9 +23,9 @@ class WXDLLIMPEXP_FWD_CORE wxPen; #if defined(__WXGTK127__) -typedef gint8 wxGTKDash; +typedef signed char wxGTKDash; #else -typedef gchar wxGTKDash; +typedef char wxGTKDash; #endif //----------------------------------------------------------------------------- @@ -42,8 +42,6 @@ public: wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif - virtual ~wxPen(); - bool operator==(const wxPen& pen) const; bool operator!=(const wxPen& pen) const { return !(*this == pen); } @@ -54,8 +52,9 @@ public: void SetStyle( wxPenStyle style ); void SetWidth( int width ); void SetDashes( int number_of_dashes, const wxDash *dash ); + void SetStipple(const wxBitmap& stipple); - wxColour &GetColour() const; + wxColour GetColour() const; wxPenCap GetCap() const; wxPenJoin GetJoin() const; wxPenStyle GetStyle() const; @@ -63,6 +62,12 @@ public: int GetDashes(wxDash **ptr) const; int GetDashCount() const; wxDash* GetDash() const; + wxBitmap *GetStipple() const; + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif private: virtual wxGDIRefData *CreateGDIRefData() const;