#ifndef WX_PRECOMP
#include "wx/bitmap.h"
+ #include "wx/colour.h"
#endif
-#include "wx/colour.h"
#include "wx/mgl/private.h"
//-----------------------------------------------------------------------------
class wxPenRefData: public wxObjectRefData
{
- public:
- wxPenRefData();
- wxPenRefData(const wxPenRefData& data);
-
- int m_width;
- int m_style;
- wxColour m_colour;
- wxBitmap m_stipple;
- pixpattern24_t m_pixPattern;
-
- // not used by wxMGL, but we want to preserve values
- int m_joinStyle;
- int m_capStyle;
- int m_countDashes;
- wxDash *m_dash;
+public:
+ wxPenRefData();
+ wxPenRefData(const wxPenRefData& data);
+
+ bool operator==(const wxPenRefData& data) const
+ {
+ // we intentionally don't compare m_hPen fields here
+ return m_style == data.m_style &&
+ m_width == data.m_width &&
+ memcmp(&m_pixPattern,
+ &data.m_pixPattern, sizeof(m_pixPattern)) == 0 &&
+ m_capStyle == data.m_capStyle &&
+ m_joinStyle == data.m_joinStyle &&
+ m_colour == data.m_colour &&
+ (m_style != wxPENSTYLE_STIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
+ (m_style != wxPENSTYLE_USER_DASH ||
+ (m_dash == data.m_dash &&
+ memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
+ }
+
+ int m_width;
+ wxPenStyle m_style;
+ wxColour m_colour;
+ wxBitmap m_stipple;
+ pixpattern24_t m_pixPattern;
+
+ // not used by wxMGL, but we want to preserve values
+ wxPenJoin m_joinStyle;
+ wxPenCap m_capStyle;
+ int m_countDashes;
+ wxDash *m_dash;
};
wxPenRefData::wxPenRefData()
{
m_width = 1;
- m_style = wxSOLID;
+ m_style = wxPENSTYLE_SOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
- m_dash = (wxDash*) NULL;
+ m_dash = NULL;
m_countDashes = 0;
int x, y, c;
IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
-wxPen::wxPen(const wxColour &colour, int width, int style)
+wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style)
{
m_refData = new wxPenRefData();
M_PENDATA->m_width = width;
M_PENDATA->m_colour = colour;
}
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& colour, int width, int style)
+{
+ m_refData = new wxPenRefData();
+ M_PENDATA->m_width = width;
+ M_PENDATA->m_style = (wxPenStyle)style;
+ M_PENDATA->m_colour = colour;
+}
+#endif
+
wxPen::wxPen(const wxBitmap& stipple, int width)
{
- wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
+ wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") );
wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
- _T("stipple bitmap must be 8x8") );
+ wxT("stipple bitmap must be 8x8") );
m_refData = new wxPenRefData();
M_PENDATA->m_width = width;
- M_PENDATA->m_style = wxSTIPPLE;
+ M_PENDATA->m_style = wxPENSTYLE_STIPPLE;
M_PENDATA->m_stipple = stipple;
wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
}
bool wxPen::operator == (const wxPen& pen) const
{
- return m_refData == pen.m_refData;
+ if (m_refData == pen.m_refData) return true;
+
+ if (!m_refData || !pen.m_refData) return false;
+
+ return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
}
bool wxPen::operator != (const wxPen& pen) const
M_PENDATA->m_colour.Set(red, green, blue);
}
-void wxPen::SetCap(int capStyle)
+void wxPen::SetCap(wxPenCap capStyle)
{
AllocExclusive();
M_PENDATA->m_capStyle = capStyle;
}
-void wxPen::SetJoin(int joinStyle)
+void wxPen::SetJoin(wxPenJoin joinStyle)
{
AllocExclusive();
M_PENDATA->m_joinStyle = joinStyle;
}
-void wxPen::SetStyle(int style)
+void wxPen::SetStyle(wxPenStyle style)
{
AllocExclusive();
M_PENDATA->m_style = style;
void wxPen::SetStipple(const wxBitmap& stipple)
{
- wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
+ wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") );
wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
- _T("stipple bitmap must be 8x8") );
+ wxT("stipple bitmap must be 8x8") );
AllocExclusive();
M_PENDATA->m_stipple = stipple;
int wxPen::GetDashes(wxDash **ptr) const
{
- *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
- return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
+ *ptr = (wxDash*)M_PENDATA->m_dash;
+ return M_PENDATA->m_countDashes;
}
int wxPen::GetDashCount() const
{
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
return (M_PENDATA->m_countDashes);
}
wxDash* wxPen::GetDash() const
{
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
+
return (wxDash*)M_PENDATA->m_dash;
}
-int wxPen::GetCap() const
+wxPenCap wxPen::GetCap() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
return M_PENDATA->m_capStyle;
}
-int wxPen::GetJoin() const
+wxPenJoin wxPen::GetJoin() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
return M_PENDATA->m_joinStyle;
}
-int wxPen::GetStyle() const
+wxPenStyle wxPen::GetStyle() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
return M_PENDATA->m_style;
}
int wxPen::GetWidth() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
return M_PENDATA->m_width;
}
-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const
{
- wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+ wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );
return M_PENDATA->m_colour;
}
wxBitmap *wxPen::GetStipple() const
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
return &(M_PENDATA->m_stipple);
}
void* wxPen::GetPixPattern() const
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
return (void*)&(M_PENDATA->m_pixPattern);
}
-bool wxPen::Ok() const
-{
- return (m_refData != NULL);
-}
-
-wxObjectRefData *wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const
{
return new wxPenRefData;
}
-wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
{
return new wxPenRefData(*(wxPenRefData *)data);
}
projects / wxWidgets.git / blobdiff