// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef __GTKPENH__
-#define __GTKPENH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPen;
+#ifndef _WX_GTK_PEN_H_
+#define _WX_GTK_PEN_H_
typedef gint8 wxGTKDash;
// wxPen
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxPenBase
{
public:
wxPen() { }
- wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
- ~wxPen();
-
- wxPen( const wxPen& pen )
- : wxGDIObject()
- { Ref(pen); }
- wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
+ wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+ wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+#endif
- bool Ok() const { return m_refData != NULL; }
+ virtual ~wxPen();
- bool operator == ( const wxPen& pen ) const;
- bool operator != (const wxPen& pen) const { return !(*this == pen); }
+ bool operator==(const wxPen& pen) const;
+ bool operator!=(const wxPen& pen) const { return !(*this == pen); }
void SetColour( const wxColour &colour );
void SetColour( unsigned char red, unsigned char green, unsigned char blue );
- void SetCap( int capStyle );
- void SetJoin( int joinStyle );
- void SetStyle( int style );
+ void SetCap( wxPenCap capStyle );
+ void SetJoin( wxPenJoin joinStyle );
+ 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;
- int GetCap() const;
- int GetJoin() const;
- int GetStyle() const;
+ wxColour GetColour() const;
+ wxPenCap GetCap() const;
+ wxPenJoin GetJoin() const;
+ wxPenStyle GetStyle() const;
int GetWidth() const;
int GetDashes(wxDash **ptr) const;
int GetDashCount() const;
wxDash* GetDash() const;
+ wxBitmap *GetStipple() const;
-private:
- // ref counting code
- virtual wxObjectRefData *CreateRefData() const;
- virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+protected:
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
DECLARE_DYNAMIC_CLASS(wxPen)
};
-#endif // __GTKPENH__
+#endif // _WX_GTK_PEN_H_