projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No changes, just minor wxMSW code cleanup: use WinStruct<>.
[wxWidgets.git]
/
src
/
gtk
/
pen.cpp
diff --git
a/src/gtk/pen.cpp
b/src/gtk/pen.cpp
index 7fb6e0cd0d8bc15580572d8eb8532672e550707c..4081bf6dfce861962fe133aee7458b11200d4853 100644
(file)
--- a/
src/gtk/pen.cpp
+++ b/
src/gtk/pen.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: pen.cpp
+// Name:
src/gtk/
pen.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,13
+7,14
@@
// 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/pen.h"
#include "wx/pen.h"
-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+#endif
#include <gdk/gdk.h>
#include <gdk/gdk.h>
@@
-21,21
+22,21
@@
// wxPen
//-----------------------------------------------------------------------------
// wxPen
//-----------------------------------------------------------------------------
-class wxPenRefData: public wx
Object
RefData
+class wxPenRefData: public wx
GDI
RefData
{
public:
wxPenRefData()
{
m_width = 1;
{
public:
wxPenRefData()
{
m_width = 1;
- m_style = wxSOLID;
+ m_style = wx
PENSTYLE_
SOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
- m_dash =
(wxGTKDash*)
NULL;
+ m_dash = NULL;
m_countDashes = 0;
}
m_countDashes = 0;
}
-
+
wxPenRefData( const wxPenRefData& data )
wxPenRefData( const wxPenRefData& data )
- : wx
Object
RefData()
+ : wx
GDI
RefData()
{
m_style = data.m_style;
m_width = data.m_width;
{
m_style = data.m_style;
m_width = data.m_width;
@@
-49,19
+50,19
@@
public:
bool operator == (const wxPenRefData& data) const
{
if ( m_countDashes != data.m_countDashes )
bool operator == (const wxPenRefData& data) const
{
if ( m_countDashes != data.m_countDashes )
- return
FALSE
;
+ return
false
;
if ( m_dash )
{
if ( !data.m_dash ||
memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) )
{
if ( m_dash )
{
if ( !data.m_dash ||
memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) )
{
- return
FALSE
;
+ return
false
;
}
}
else if ( data.m_dash )
{
}
}
else if ( data.m_dash )
{
- return
FALSE
;
+ return
false
;
}
}
@@
-71,11
+72,11
@@
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_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;
wxColour m_colour;
int m_countDashes;
wxGTKDash *m_dash;
@@
-87,7
+88,7
@@
public:
IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
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_refData = new wxPenRefData();
M_PENDATA->m_width = width;
@@
-95,128
+96,155
@@
wxPen::wxPen( const wxColour &colour, int width, int style )
M_PENDATA->m_colour = colour;
}
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()
{
// m_refData unrefed in ~wxObject
}
wxPen::~wxPen()
{
// m_refData unrefed in ~wxObject
}
-wx
ObjectRefData *wxPen::Create
RefData() const
+wx
GDIRefData *wxPen::CreateGDI
RefData() const
{
return new wxPenRefData;
}
{
return new wxPenRefData;
}
-wx
ObjectRefData *wxPen::CloneRefData(const wxObject
RefData *data) const
+wx
GDIRefData *wxPen::CloneGDIRefData(const wxGDI
RefData *data) const
{
return new wxPenRefData(*(wxPenRefData *)data);
}
bool wxPen::operator == ( const wxPen& pen ) 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
;
-
+ 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 = (wxGTKDash *)dash;
}
M_PENDATA->m_countDashes = number_of_dashes;
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();
{
AllocExclusive();
-
+
M_PENDATA->m_colour.Set( red, green, blue );
}
M_PENDATA->m_colour.Set( red, green, blue );
}
-void wxPen::SetCap(
int
capStyle )
+void wxPen::SetCap(
wxPenCap
capStyle )
{
AllocExclusive();
{
AllocExclusive();
-
+
M_PENDATA->m_capStyle = capStyle;
}
M_PENDATA->m_capStyle = capStyle;
}
-void wxPen::SetJoin(
int
joinStyle )
+void wxPen::SetJoin(
wxPenJoin
joinStyle )
{
AllocExclusive();
{
AllocExclusive();
-
+
M_PENDATA->m_joinStyle = joinStyle;
}
M_PENDATA->m_joinStyle = joinStyle;
}
-void wxPen::SetStyle(
int
style )
+void wxPen::SetStyle(
wxPenStyle
style )
{
AllocExclusive();
{
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;
}
int wxPen::GetDashes( wxDash **ptr ) const
{
M_PENDATA->m_width = width;
}
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
{
}
int wxPen::GetDashCount() const
{
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
return (M_PENDATA->m_countDashes);
}
wxDash* wxPen::GetDash() const
{
return (M_PENDATA->m_countDashes);
}
wxDash* wxPen::GetDash() const
{
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
+
return (wxDash*)M_PENDATA->m_dash;
}
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;
}
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;
}
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
{
return M_PENDATA->m_style;
}
int wxPen::GetWidth() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), -1, wxT("invalid pen") );
return M_PENDATA->m_width;
}
return M_PENDATA->m_width;
}
-wxColour
&
wxPen::GetColour() const
+wxColour wxPen::GetColour() const
{
{
- wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), wxNullColour, wxT("invalid pen") );
return M_PENDATA->m_colour;
}
return M_PENDATA->m_colour;
}
+// stippled pens are not supported by wxGTK
+void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))
+{
+ wxFAIL_MSG( "stippled pens not supported" );
+}
+
+wxBitmap *wxPen::GetStipple() const
+{
+ return NULL;
+}
+