/////////////////////////////////////////////////////////////////////////////
-// Name: pen.cpp
+// Name: src/gtk1/pen.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/pen.h"
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+#endif
+
#include <gdk/gdk.h>
//-----------------------------------------------------------------------------
// wxPen
//-----------------------------------------------------------------------------
-class wxPenRefData: public wxObjectRefData
+class wxPenRefData : public wxGDIRefData
{
public:
wxPenRefData()
{
m_width = 1;
- m_style = wxSOLID;
+ m_style = wxPENSTYLE_SOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
- m_dash = (wxGTKDash*) NULL;
+ m_dash = NULL;
m_countDashes = 0;
}
-
+
wxPenRefData( const wxPenRefData& data )
- : wxObjectRefData()
+ : wxGDIRefData()
{
m_style = data.m_style;
m_width = data.m_width;
m_capStyle = data.m_capStyle;
m_colour = data.m_colour;
m_countDashes = data.m_countDashes;
-/*
- if (data.m_dash) TODO
- m_dash = new
-*/
m_dash = data.m_dash;
}
bool operator == (const wxPenRefData& data) const
{
- return (m_style == data.m_style &&
- m_width == data.m_width &&
- m_joinStyle == data.m_joinStyle &&
- m_capStyle == data.m_capStyle &&
- m_colour == data.m_colour);
+ if ( m_countDashes != data.m_countDashes )
+ return false;
+
+ if ( m_dash )
+ {
+ if ( !data.m_dash ||
+ memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) )
+ {
+ return false;
+ }
+ }
+ else if ( data.m_dash )
+ {
+ return false;
+ }
+
+
+ return m_style == data.m_style &&
+ m_width == data.m_width &&
+ m_joinStyle == data.m_joinStyle &&
+ m_capStyle == data.m_capStyle &&
+ m_colour == data.m_colour;
}
-
+
int m_width;
- int m_style;
- int m_joinStyle;
- int m_capStyle;
+ wxPenStyle m_style;
+ wxPenJoin m_joinStyle;
+ wxPenCap m_capStyle;
wxColour m_colour;
int m_countDashes;
wxGTKDash *m_dash;
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;
}
-wxPen::~wxPen()
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& colour, int width, int style)
{
- // m_refData unrefed in ~wxObject
+ m_refData = new wxPenRefData();
+ M_PENDATA->m_width = width;
+ M_PENDATA->m_style = (wxPenStyle)style;
+ M_PENDATA->m_colour = colour;
}
+#endif
-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);
}
bool wxPen::operator == ( const wxPen& pen ) const
{
- if (m_refData == pen.m_refData) return TRUE;
-
- if (!m_refData || !pen.m_refData) return FALSE;
-
- return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)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;
}
void wxPen::SetColour( const wxColour &colour )
{
AllocExclusive();
-
+
M_PENDATA->m_colour = colour;
}
void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
{
AllocExclusive();
-
+
M_PENDATA->m_countDashes = number_of_dashes;
- M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */
+ M_PENDATA->m_dash = (wxGTKDash *)dash;
}
-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )
{
AllocExclusive();
-
+
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::SetWidth( int width )
{
AllocExclusive();
-
+
M_PENDATA->m_width = width;
}
+void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))
+{
+ wxFAIL_MSG( "stippled pens not supported" );
+}
+
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(), wxCAP_INVALID, 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(), wxJOIN_INVALID, 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(), wxPENSTYLE_INVALID, 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
+{
+ return NULL;
+}
+
projects / wxWidgets.git / blobdiff