X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..6a6ea041d96f19c89c0f68741502f08e5cee97ec:/include/wx/palmos/pen.h

diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h
index 26b86cf569..41a7146509 100644
--- a/include/wx/palmos/pen.h
+++ b/include/wx/palmos/pen.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/pen.h
+// Name:        wx/palmos/pen.h
 // Purpose:     wxPen class
-// 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
 /////////////////////////////////////////////////////////////////////////////
@@ -12,17 +12,13 @@
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "pen.h"
-#endif
-
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 #include "wx/colour.h"
 
 typedef WXDWORD wxMSWDash;
 
-class WXDLLEXPORT wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;
 
 // VZ: this class should be made private
 class WXDLLEXPORT wxPenRefData : public wxGDIRefData
@@ -40,7 +36,7 @@ public:
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&
-               (m_style != wxSTIPPLE || m_stipple == data.m_stipple) &&
+               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
                (m_style != wxUSER_DASH ||
                 (m_nbDash == data.m_nbDash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
@@ -58,7 +54,7 @@ protected:
     WXHPEN        m_hPen;
 
 private:
-    friend class WXDLLEXPORT wxPen;
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;
 
     // Cannot use
     //  DECLARE_NO_COPY_CLASS(wxPenRefData)
@@ -81,17 +77,8 @@ public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
-    wxPen(const wxPen& pen) { Ref(pen); }
     virtual ~wxPen();
 
-    wxPen& operator=(const wxPen& pen)
-    {
-        if ( this != &pen )
-            Ref(pen);
-
-        return *this;
-    }
-
     bool operator==(const wxPen& pen) const
     {
         const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
@@ -102,7 +89,8 @@ public:
 
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
-    virtual bool Ok() const { return (m_refData != NULL); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL); }
 
     // Override in order to recreate the pen
     void SetColour(const wxColour& col);
@@ -132,7 +120,7 @@ public:
 
     // Internal
     bool RealizeResource();
-    bool FreeResource(bool force = FALSE);
+    bool FreeResource(bool force = false);
     WXHANDLE GetResourceHandle() const;
     bool IsFree() const;
     void Unshare();
@@ -142,4 +130,3 @@ private:
 };
 
 #endif // _WX_PEN_H_
-