don't leak wxImageList if wxHF_CONTENTS is not used in wxHtmlHelpWindow

[wxWidgets.git] / include / wx / mac / carbon / pen.h

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index b1032c2fb78248fe86bee5d8077e2a683648a976..69eae585d340d1b0a3b7994e09df1d509cec7628 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -16,33 +16,7 @@
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxPen;
-
-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxPen;
-public:
-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData();
-
-    wxPenRefData& operator=(const wxPenRefData& data);
-
-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)
+class WXDLLIMPEXP_FWD_CORE wxPen;
 
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
@@ -52,20 +26,14 @@ public:
   wxPen();
   wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
   wxPen(const wxBitmap& stipple, int width);
-  wxPen(const wxPen& pen)
-      : wxGDIObject()
-      { Ref(pen); }
-  ~wxPen();
-
-  inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
-  inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
-  inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
+  virtual ~wxPen();
 
-  virtual bool Ok() 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) ;
-  void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
+  void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;
@@ -74,25 +42,22 @@ 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
 
   // Useful helper: create the brush resource
   bool RealizeResource();
 
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
+private:
+    void Unshare();
 };
 
 #endif