projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*wprintf() functions should be extern, not static, when we define them in wxNEED_WPRI...
[wxWidgets.git]
/
src
/
x11
/
pen.cpp
diff --git
a/src/x11/pen.cpp
b/src/x11/pen.cpp
index 80a64d6edbd45fa8eb2abe530645a0d2ef3ea0c2..23cf2ca01e3f0439131e304a67753e8669f422ea 100644
(file)
--- a/
src/x11/pen.cpp
+++ b/
src/x11/pen.cpp
@@
-9,15
+9,16
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "wx/setup.h"
-#include "wx/utils.h"
#include "wx/pen.h"
#include "wx/pen.h"
-#include "wx/colour.h"
-#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #include "wx/bitmap.h"
+ #include "wx/colour.h"
+#endif
//-----------------------------------------------------------------------------
// wxPen
//-----------------------------------------------------------------------------
// wxPen
@@
-35,7
+36,7
@@
public:
m_dash = (wxX11Dash*) NULL;
m_countDashes = 0;
}
m_dash = (wxX11Dash*) NULL;
m_countDashes = 0;
}
-
+
wxPenRefData( const wxPenRefData& data )
{
m_style = data.m_style;
wxPenRefData( const wxPenRefData& data )
{
m_style = data.m_style;
@@
-60,7
+61,7
@@
public:
m_capStyle == data.m_capStyle &&
m_colour == data.m_colour);
}
m_capStyle == data.m_capStyle &&
m_colour == data.m_colour);
}
-
+
int m_width;
int m_style;
int m_joinStyle;
int m_width;
int m_style;
int m_joinStyle;
@@
-102,67
+103,67
@@
wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
bool wxPen::operator == ( const wxPen& pen ) const
{
bool wxPen::operator == ( const wxPen& pen ) const
{
- if (m_refData == pen.m_refData) return
TRUE
;
-
- if (!m_refData || !pen.m_refData) return
FALSE
;
-
+ 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();
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_colour = colour;
}
void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
{
AllocExclusive();
-
+
M_PENDATA->m_countDashes = number_of_dashes;
M_PENDATA->m_dash = (wxX11Dash *)dash; // TODO
}
M_PENDATA->m_countDashes = number_of_dashes;
M_PENDATA->m_dash = (wxX11Dash *)dash; // TODO
}
-void wxPen::SetColour(
int red, int green, int
blue )
+void wxPen::SetColour(
unsigned char red, unsigned char green, unsigned char
blue )
{
AllocExclusive();
{
AllocExclusive();
-
+
M_PENDATA->m_colour.Set( red, green, blue );
}
void wxPen::SetCap( int capStyle )
{
AllocExclusive();
M_PENDATA->m_colour.Set( red, green, blue );
}
void wxPen::SetCap( int capStyle )
{
AllocExclusive();
-
+
M_PENDATA->m_capStyle = capStyle;
}
void wxPen::SetJoin( int joinStyle )
{
AllocExclusive();
M_PENDATA->m_capStyle = capStyle;
}
void wxPen::SetJoin( int joinStyle )
{
AllocExclusive();
-
+
M_PENDATA->m_joinStyle = joinStyle;
}
void wxPen::SetStipple( wxBitmap *stipple )
{
AllocExclusive();
M_PENDATA->m_joinStyle = joinStyle;
}
void wxPen::SetStipple( wxBitmap *stipple )
{
AllocExclusive();
-
- M_PENDATA->m_stipple = *stipple;
;
+
+ M_PENDATA->m_stipple = *stipple;
}
void wxPen::SetStyle( int style )
{
AllocExclusive();
}
void wxPen::SetStyle( int style )
{
AllocExclusive();
-
+
M_PENDATA->m_style = style;
}
void wxPen::SetWidth( int width )
{
AllocExclusive();
M_PENDATA->m_style = style;
}
void wxPen::SetWidth( int width )
{
AllocExclusive();
-
+
M_PENDATA->m_width = width;
}
M_PENDATA->m_width = width;
}