// Author: David Webster
// Modified by:
// Created: 10/10/99
-// RCS-ID: $Id$
// Copyright: (c) David Webster
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
typedef long wxPMDash;
-class WXDLLIMPEXP_FWD_CORE wxPen;
-
-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
-{
- friend class WXDLLIMPEXP_FWD_CORE wxPen;
-public:
- wxPenRefData();
- wxPenRefData(const wxPenRefData& rData);
- virtual ~wxPenRefData();
-
- bool operator==(const wxPenRefData& data) const
- {
- // we intentionally don't compare m_hPen fields here
- return m_nStyle == data.m_nStyle &&
- m_nWidth == data.m_nWidth &&
- m_nJoin == data.m_nJoin &&
- m_nCap == data.m_nCap &&
- m_vColour == data.m_vColour &&
- (m_nStyle != wxSTIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) &&
- (m_nStyle != wxUSER_DASH ||
- (m_dash == data.m_dash &&
- memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
- }
-
-protected:
- int m_nWidth;
- int m_nStyle;
- int m_nJoin;
- int m_nCap;
- wxBitmap m_vStipple;
- int m_nbDash;
- wxDash * m_dash;
- wxColour m_vColour;
- WXHPEN m_hPen;// in OS/2 GPI this will be the PS the pen is associated with
-};
-
-#define M_PENDATA ((wxPenRefData *)m_refData)
-
+// ----------------------------------------------------------------------------
// Pen
-class WXDLLEXPORT wxPen : public wxGDIObject
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase
{
public:
- wxPen();
+ wxPen() { }
wxPen( const wxColour& rColour
,int nWidth = 1
- ,int nStyle = wxSOLID
+ ,wxPenStyle nStyle = wxPENSTYLE_SOLID
);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+ wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+#endif
+
wxPen( const wxBitmap& rStipple
,int nWidth
);
- virtual ~wxPen();
-
- inline bool operator == (const wxPen& rPen) const
- {
- const wxPenRefData *penData = (wxPenRefData *)rPen.m_refData;
-
- // an invalid pen is only equal to another invalid pen
- return m_refData ? penData && *M_PENDATA == *penData : !penData;
- }
+ virtual ~wxPen() { }
+ bool operator == (const wxPen& rPen) const;
inline bool operator != (const wxPen& rPen) const
{ return !(*this == rPen); }
void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
void SetWidth(int nWidth);
- void SetStyle(int nStyle);
+ void SetStyle(wxPenStyle nStyle);
void SetStipple(const wxBitmap& rStipple);
void SetDashes( int nNbDashes
,const wxDash* pDash
);
- void SetJoin(int nJoin);
- void SetCap(int nCap);
+ void SetJoin(wxPenJoin nJoin);
+ void SetCap(wxPenCap nCap);
void SetPS(HPS hPS);
- inline wxColour& GetColour(void) const { return (M_PENDATA ? M_PENDATA->m_vColour : wxNullColour); };
- inline int GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_nWidth : 0); };
- inline int GetStyle(void) const { return (M_PENDATA ? M_PENDATA->m_nStyle : 0); };
- inline int GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_nJoin : 0); };
- inline int GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_nCap : 0); };
- inline int GetPS(void) const { return (M_PENDATA ? M_PENDATA->m_hPen : 0); };
- inline int GetDashes(wxDash **ptr) const
- {
- *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
- return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
- }
- inline wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
- inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };
-
- inline wxBitmap* GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_vStipple) : (wxBitmap*) NULL); };
+ wxColour GetColour(void) const;
+ int GetWidth(void) const;
+ wxPenStyle GetStyle(void) const;
+ wxPenJoin GetJoin(void) const;
+ wxPenCap GetCap(void) const;
+ int GetPS(void) const;
+ int GetDashes(wxDash **ptr) const;
+ wxDash* GetDash() const;
+ int GetDashCount() const;
+ wxBitmap* GetStipple(void) const;
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+ wxDEPRECATED_FUTURE( void SetStyle(int style) )
+ { SetStyle((wxPenStyle)style); }
+#endif
//
// Implementation
DECLARE_DYNAMIC_CLASS(wxPen)
}; // end of CLASS wxPen
-extern int wx2os2PenStyle(int nWxStyle);
+extern int wx2os2PenStyle(wxPenStyle nWxStyle);
#endif
// _WX_PEN_H_