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 6cfa473f4517b2fae7cbfb515d426dbd4c10c3d5..c9db991ae5beb1feae52ea2a6fc2bdfae9eecc81 100644 (file)
--- a/src/palmos/pen.cpp
+++ b/src/palmos/pen.cpp
@@ -1,32 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palmos/pen.cpp
+// Name:        src/palmos/pen.cpp
 // Purpose:     wxPen
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "pen.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/pen.h"
+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
 #endif
 
 static int wx2msPenStyle(int wx_style);
@@ -56,7 +52,7 @@ wxPen::~wxPen()
 }
 
 // Should implement Create
-wxPen::wxPen(const wxColour& col, int Width, int Style)
+wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style)
 {
 }
 
@@ -84,10 +80,6 @@ bool wxPen::IsFree() const
     return false;
 }
 
-void wxPen::Unshare()
-{
-}
-
 void wxPen::SetColour(const wxColour& col)
 {
 }
@@ -100,7 +92,7 @@ void wxPen::SetWidth(int Width)
 {
 }
 
-void wxPen::SetStyle(int Style)
+void wxPen::SetStyle(wxPenStyle Style)
 {
 }
 
@@ -112,11 +104,21 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
 }
 
-void wxPen::SetJoin(int Join)
+void wxPen::SetJoin(wxPenJoin Join)
+{
+}
+
+void wxPen::SetCap(wxPenCap Cap)
+{
+}
+
+wxGDIRefData *wxPen::CreateGDIRefData() const
 {
+    return new wxPenRefData();
 }
 
-void wxPen::SetCap(int Cap)
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
 {
+    return new wxPenRefData(*static_cast<const wxPenRefData *>(data));
 }