using subclass as impl ptr, common code in macro because mix-in are not possible...

[wxWidgets.git] / include / wx / palmos / pen.h

diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h
index 91731fcf51849f41d282b505bbd1759386e3cdc4..4dd60758b91b798a62ffc8197e96f0a9a226cba7 100644 (file)
--- a/include/wx/palmos/pen.h
+++ b/include/wx/palmos/pen.h
@@ -2,7 +2,7 @@
 // Name:        wx/palmos/pen.h
 // Purpose:     wxPen class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        wx/palmos/pen.h
 // Purpose:     wxPen class
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Yunhui Fu

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne


@@ -21,7 +21,7 @@ typedef WXDWORD wxMSWDash;
 class WXDLLIMPEXP_FWD_CORE wxPen;
 
 // VZ: this class should be made private
 class WXDLLIMPEXP_FWD_CORE wxPen;
 
 // VZ: this class should be made private

-class WXDLLEXPORT wxPenRefData : public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPenRefData : public wxGDIRefData

 {
 public:
     wxPenRefData();
 {
 public:
     wxPenRefData();


@@ -44,7 +44,7 @@ public:
 
 protected:
     int           m_width;
 
 protected:
     int           m_width;

-    int           m_style;
+    wxPenStyle    m_style;

     int           m_join;
     int           m_cap;
     wxBitmap      m_stipple;
     int           m_join;
     int           m_cap;
     wxBitmap      m_stipple;


@@ -71,11 +71,15 @@ private:
 // Pen
 // ----------------------------------------------------------------------------
 
 // Pen
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPen : public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase

 {
 public:
     wxPen();
 {
 public:
     wxPen();

-    wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
+    wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+#endif
+

     wxPen(const wxBitmap& stipple, int width);
     virtual ~wxPen();
 
     wxPen(const wxBitmap& stipple, int width);
     virtual ~wxPen();
 


@@ -94,17 +98,17 @@ public:
     void SetColour(unsigned char r, unsigned char g, unsigned char b);
 
     void SetWidth(int width);
     void SetColour(unsigned char r, unsigned char g, unsigned char b);
 
     void SetWidth(int width);

-    void SetStyle(int style);
+    void SetStyle(wxPenStyle style);

     void SetStipple(const wxBitmap& stipple);
     void SetDashes(int nb_dashes, const wxDash *dash);
     void SetStipple(const wxBitmap& stipple);
     void SetDashes(int nb_dashes, const wxDash *dash);

-    void SetJoin(int join);
-    void SetCap(int cap);
+    void SetJoin(wxPenJoin join);
+    void SetCap(wxPenCap cap);

 
     wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
     int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
 
     wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
     int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };

-    int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-    int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-    int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
+    wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
+    wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
+    wxPenCap GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };

     int GetDashes(wxDash **ptr) const
     {
         *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
     int GetDashes(wxDash **ptr) const
     {
         *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);


@@ -120,7 +124,17 @@ public:
     bool FreeResource(bool force = false);
     WXHANDLE GetResourceHandle() const;
     bool IsFree() const;
     bool FreeResource(bool force = false);
     WXHANDLE GetResourceHandle() const;
     bool IsFree() const;

-    void Unshare();
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
+protected:
+    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
+    // same as FreeResource() + RealizeResource()
+    bool Recreate();

 
 private:
     DECLARE_DYNAMIC_CLASS(wxPen)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPen)