projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct painting of the items with custom colours in TVIS_DROPHILITED state (patch...
[wxWidgets.git]
/
src
/
mgl
/
pen.cpp
diff --git
a/src/mgl/pen.cpp
b/src/mgl/pen.cpp
index dc2e476e82c5e3c08a3e52f5bf96c4e351206e80..a98e011a9e26aecc5e738147944a09cbcbaa37c4 100644
(file)
--- a/
src/mgl/pen.cpp
+++ b/
src/mgl/pen.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: pen.cpp
+// Name:
src/mgl/
pen.cpp
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
@@
-7,11
+7,6
@@
// 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"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-21,6
+16,7
@@
#include "wx/pen.h"
#include "wx/bitmap.h"
#include "wx/pen.h"
#include "wx/bitmap.h"
+#include "wx/colour.h"
#include "wx/mgl/private.h"
//-----------------------------------------------------------------------------
#include "wx/mgl/private.h"
//-----------------------------------------------------------------------------
@@
-97,7
+93,7
@@
wxPen::wxPen(const wxColour &colour, int width, int style)
wxPen::wxPen(const wxBitmap& stipple, int width)
{
wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
wxPen::wxPen(const wxBitmap& stipple, int width)
{
wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
- wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
+ wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
_T("stipple bitmap must be 8x8") );
m_refData = new wxPenRefData();
_T("stipple bitmap must be 8x8") );
m_refData = new wxPenRefData();
@@
-107,18
+103,6
@@
wxPen::wxPen(const wxBitmap& stipple, int width)
wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
}
wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL);
}
-wxPen::wxPen(const wxPen& pen)
-{
- Ref(pen);
-}
-
-wxPen& wxPen::operator = (const wxPen& pen)
-{
- if (*this == pen) return (*this);
- Ref(pen);
- return *this;
-}
-
bool wxPen::operator == (const wxPen& pen) const
{
return m_refData == pen.m_refData;
bool wxPen::operator == (const wxPen& pen) const
{
return m_refData == pen.m_refData;
@@
-142,7
+126,7
@@
void wxPen::SetDashes(int number_of_dashes, const wxDash *dash)
M_PENDATA->m_dash = (wxDash *)dash; /* TODO */
}
M_PENDATA->m_dash = (wxDash *)dash; /* TODO */
}
-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);
{
AllocExclusive();
M_PENDATA->m_colour.Set(red, green, blue);
@@
-169,7
+153,7
@@
void wxPen::SetStyle(int style)
void wxPen::SetStipple(const wxBitmap& stipple)
{
wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
void wxPen::SetStipple(const wxBitmap& stipple)
{
wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
- wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
+ wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
_T("stipple bitmap must be 8x8") );
AllocExclusive();
_T("stipple bitmap must be 8x8") );
AllocExclusive();
@@
-183,20
+167,20
@@
void wxPen::SetWidth(int width)
M_PENDATA->m_width = width;
}
M_PENDATA->m_width = width;
}
-int wxPen::GetDashes(wxDash **ptr) const
+int wxPen::GetDashes(wxDash **ptr) const
{
{
- *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+ *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
}
return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
}
-int wxPen::GetDashCount() const
-{
- return (M_PENDATA->m_countDashes);
+int wxPen::GetDashCount() const
+{
+ return (M_PENDATA->m_countDashes);
}
}
-wxDash* wxPen::GetDash() const
-{
- return (wxDash*)M_PENDATA->m_dash;
+wxDash* wxPen::GetDash() const
+{
+ return (wxDash*)M_PENDATA->m_dash;
}
int wxPen::GetCap() const
}
int wxPen::GetCap() const
@@
-263,4
+247,3
@@
wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
{
return new wxPenRefData(*(wxPenRefData *)data);
}
{
return new wxPenRefData(*(wxPenRefData *)data);
}
-