X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d57de48588afa27a9df2026b830e6cd5b858b5d..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/gtk1/pen.h diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index b54de75a51..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 //----------------------------------------------------------------------------- @@ -54,7 +54,7 @@ public: 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; @@ -64,6 +64,11 @@ public: 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; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;