projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed more unneeded files, see patch 890642
[wxWidgets.git]
/
src
/
x11
/
pen.cpp
diff --git
a/src/x11/pen.cpp
b/src/x11/pen.cpp
index 339ef203f524fdcd84a3bf0ba517e18f41c88a51..ecff52dd0289a7831675edbf65356dcdb04b692b 100644
(file)
--- a/
src/x11/pen.cpp
+++ b/
src/x11/pen.cpp
@@
-9,13
+9,15
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "pen.h"
#endif
#include "wx/setup.h"
#include "wx/utils.h"
#include "wx/pen.h"
#pragma implementation "pen.h"
#endif
#include "wx/setup.h"
#include "wx/utils.h"
#include "wx/pen.h"
+#include "wx/colour.h"
+#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// wxPen
//-----------------------------------------------------------------------------
// wxPen
@@
-47,6
+49,7
@@
public:
m_dash = new
*/
m_dash = data.m_dash;
m_dash = new
*/
m_dash = data.m_dash;
+ m_stipple = data.m_stipple;
}
bool operator == (const wxPenRefData& data) const
}
bool operator == (const wxPenRefData& data) const
@@
-64,6
+67,7
@@
public:
int m_capStyle;
wxColour m_colour;
int m_countDashes;
int m_capStyle;
wxColour m_colour;
int m_countDashes;
+ wxBitmap m_stipple;
wxX11Dash *m_dash;
};
wxX11Dash *m_dash;
};
@@
-141,6
+145,13
@@
void wxPen::SetJoin( int joinStyle )
M_PENDATA->m_joinStyle = joinStyle;
}
M_PENDATA->m_joinStyle = joinStyle;
}
+void wxPen::SetStipple( wxBitmap *stipple )
+{
+ AllocExclusive();
+
+ M_PENDATA->m_stipple = *stipple;;
+}
+
void wxPen::SetStyle( int style )
{
AllocExclusive();
void wxPen::SetStyle( int style )
{
AllocExclusive();
@@
-205,3
+216,10
@@
wxColour &wxPen::GetColour() const
return M_PENDATA->m_colour;
}
return M_PENDATA->m_colour;
}
+
+wxBitmap *wxPen::GetStipple() const
+{
+ wxCHECK_MSG( Ok(), &wxNullBitmap, wxT("invalid pen") );
+
+ return &M_PENDATA->m_stipple;
+}