X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74dc5eb60e80a9b2ceddd78cb577f42e48f5b3ba..4508c2b01b806be847366f0b3da0f6e65ec23cc5:/include/wx/x11/pen.h diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index 46d954158f..7b7937c264 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -12,19 +12,20 @@ #ifndef _WX_PEN_H_ #define _WX_PEN_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "pen.h" #endif +#include "wx/gdicmn.h" #include "wx/gdiobj.h" -#include "wx/colour.h" -#include "wx/bitmap.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- class wxPen; +class wxColour; +class wxBitmap; typedef char wxX11Dash; @@ -37,7 +38,8 @@ class wxPen: public wxGDIObject public: wxPen() { } - wxPen( const wxColour &colour, int width, int style ); + wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); + wxPen( const wxBitmap &stipple, int width ); ~wxPen(); wxPen( const wxPen& pen ) { Ref(pen); } @@ -55,7 +57,8 @@ public: void SetStyle( int style ); void SetWidth( int width ); void SetDashes( int number_of_dashes, const wxDash *dash ); - + void SetStipple( wxBitmap *stipple ); + wxColour &GetColour() const; int GetCap() const; int GetJoin() const; @@ -64,6 +67,7 @@ public: int GetDashes(wxDash **ptr) const; int GetDashCount() const; wxDash* GetDash() const; + wxBitmap* GetStipple() const; private: // ref counting code