Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / pen.cpp

diff --git a/src/palmos/pen.cpp b/src/palmos/pen.cpp
index 4ed1a1abd1548e2cc0d1022a9f2623832a66e6fb..c9db991ae5beb1feae52ea2a6fc2bdfae9eecc81 100644 (file)
--- a/src/palmos/pen.cpp
+++ b/src/palmos/pen.cpp
@@ -52,7 +52,7 @@ wxPen::~wxPen()
 }
 
 // Should implement Create
 }
 
 // Should implement Create

-wxPen::wxPen(const wxColour& col, int Width, int Style)
+wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style)

 {
 }
 
 {
 }
 


@@ -92,7 +92,7 @@ void wxPen::SetWidth(int Width)
 {
 }
 
 {
 }
 

-void wxPen::SetStyle(int Style)
+void wxPen::SetStyle(wxPenStyle Style)

 {
 }
 
 {
 }
 


@@ -104,11 +104,11 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
 }
 
 {
 }
 

-void wxPen::SetJoin(int Join)
+void wxPen::SetJoin(wxPenJoin Join)

 {
 }
 
 {
 }
 

-void wxPen::SetCap(int Cap)
+void wxPen::SetCap(wxPenCap Cap)

 {
 }
 
 {
 }
 


@@ -119,6 +119,6 @@ wxGDIRefData *wxPen::CreateGDIRefData() const
 
 wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
 {
 
 wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
 {

-    return new wxPenRefData(*wx_static_cast(const wxPenRefData *, data));
+    return new wxPenRefData(*static_cast<const wxPenRefData *>(data));

 }
 
 }