translate "Copy URL" string in the popup menu (feature request 1803958) (should have...

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index d192842d2c546c4c6399e2db7958f1462f850c24..30aed3bbe469497301109a6e46b45d15a9467bff 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -17,11 +17,11 @@
 
 typedef long wxPMDash;
 
 
 typedef long wxPMDash;
 

-class WXDLLEXPORT wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;

 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxPen;
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;

 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& rData);
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& rData);


@@ -35,8 +35,8 @@ public:
                m_nJoin == data.m_nJoin &&
                m_nCap == data.m_nCap &&
                m_vColour == data.m_vColour &&
                m_nJoin == data.m_nJoin &&
                m_nCap == data.m_nCap &&
                m_vColour == data.m_vColour &&

-               (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) &&
-               (m_style != wxUSER_DASH ||
+               (m_nStyle != wxSTIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) &&
+               (m_nStyle != wxUSER_DASH ||

                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
     }
                 (m_dash == data.m_dash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
     }


@@ -58,7 +58,6 @@ protected:
 // Pen
 class WXDLLEXPORT wxPen : public wxGDIObject
 {
 // Pen
 class WXDLLEXPORT wxPen : public wxGDIObject
 {

-    DECLARE_DYNAMIC_CLASS(wxPen)

 public:
     wxPen();
     wxPen( const wxColour& rColour
 public:
     wxPen();
     wxPen( const wxColour& rColour


@@ -72,7 +71,7 @@ public:
 
     inline bool   operator == (const wxPen& rPen) const
     {
 
     inline bool   operator == (const wxPen& rPen) const
     {

-        const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
+        const wxPenRefData *penData = (wxPenRefData *)rPen.m_refData;

 
         // an invalid pen is only equal to another invalid pen
         return m_refData ? penData && *M_PENDATA == *penData : !penData;
 
         // an invalid pen is only equal to another invalid pen
         return m_refData ? penData && *M_PENDATA == *penData : !penData;


@@ -81,9 +80,6 @@ public:
     inline bool   operator != (const wxPen& rPen) const
         { return !(*this == rPen); }
 
     inline bool   operator != (const wxPen& rPen) const
         { return !(*this == rPen); }
 

-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk(void) const { return (m_refData != NULL); }
-

     //
     // Override in order to recreate the pen
     //
     //
     // Override in order to recreate the pen
     //


@@ -127,11 +123,19 @@ public:
     bool     FreeResource(bool bForce = false);
     virtual WXHANDLE GetResourceHandle(void) const;
     bool     IsFree(void) const;
     bool     FreeResource(bool bForce = false);
     virtual WXHANDLE GetResourceHandle(void) const;
     bool     IsFree(void) const;

-    void     Unshare(void);

 
 private:
     LINEBUNDLE                     m_vLineBundle;
     AREABUNDLE                     m_vAreaBundle;
 
 private:
     LINEBUNDLE                     m_vLineBundle;
     AREABUNDLE                     m_vAreaBundle;

+
+protected:
+    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
+
+    // same as FreeResource() + RealizeResource()
+    bool Recreate();
+
+    DECLARE_DYNAMIC_CLASS(wxPen)

 }; // end of CLASS wxPen
 
 extern int wx2os2PenStyle(int nWxStyle);
 }; // end of CLASS wxPen
 
 extern int wx2os2PenStyle(int nWxStyle);