moving common code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index ea482f508900d2fef9d97abd8e1d7af167dec845..424bcf603e967fbf65211cc6b929e8c70509dadd 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -23,7 +23,6 @@ class WXDLLEXPORT wxBrush: public wxBrushBase
 {
  public:
     wxBrush();
-    wxBrush(short macThemeBrush ) ;
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
@@ -41,9 +40,6 @@ class WXDLLEXPORT wxBrush: public wxBrushBase
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return (m_refData != NULL) ; }
-
 protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index 859448d1544d01a0e861d31b8a152000b278b712..69eae585d340d1b0a3b7994e09df1d509cec7628 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -18,46 +18,6 @@
 
 class WXDLLIMPEXP_FWD_CORE wxPen;
 
-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
-{
-    friend class WXDLLIMPEXP_FWD_CORE wxPen;
-public:
-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-    virtual ~wxPenRefData();
-
-    wxPenRefData& operator=(const wxPenRefData& data);
-
-    bool operator==(const wxPenRefData& data) const
-    {
-        // we intentionally don't compare m_hPen fields here
-        return m_style == data.m_style &&
-               m_width == data.m_width &&
-               m_join == data.m_join &&
-               m_cap == data.m_cap &&
-               m_colour == data.m_colour &&
-               (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));
-    }
-
-protected:
-  int           m_width;
-  int           m_style;
-  int           m_join ;
-  int           m_cap ;
-  wxBitmap      m_stipple ;
-  int           m_nbDash ;
-  wxDash *      m_dash ;
-  wxColour      m_colour;
-/* TODO: implementation
-  WXHPEN        m_hPen;
-*/
-};
-
-#define M_PENDATA ((wxPenRefData *)m_refData)
-
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
 {
@@ -68,18 +28,8 @@ public:
   wxPen(const wxBitmap& stipple, int width);
   virtual ~wxPen();
 
-  inline bool operator == (const wxPen& pen) const
-  {
-    const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
-
-    // an invalid pen is only equal to another invalid pen
-    return m_refData ? penData && *M_PENDATA == *penData : !penData;
-  }
-
-  inline bool operator != (const wxPen& pen) const { return !(*this == pen); }
-
-  virtual bool Ok() const { return IsOk(); }
-  virtual bool IsOk() const { return (m_refData != NULL) ; }
+  bool operator == (const wxPen& pen) const;
+  bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
@@ -92,16 +42,14 @@ public:
   void SetJoin(int join)  ;
   void SetCap(int cap)  ;
 
-  inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-  inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-  inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-  inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-  inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
-  inline int GetDashes(wxDash **ptr) const {
-     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
-  }
+  wxColour& GetColour() const ;
+  int GetWidth() const;
+  int GetStyle() const;
+  int GetJoin() const;
+  int GetCap() const;
+  int GetDashes(wxDash **ptr) const;
 
-  inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
+  wxBitmap *GetStipple() const ;
 
 // Implementation