Applied patch [ 579219 ] wxNotebook:SetPadding added

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

diff --git a/include/wx/mac/pen.h b/include/wx/mac/pen.h
index 4da77c1586318bc77a9872a550045f0cc5b64396..5a36f8aeac2769ad474c03371b14c69eceaa53c3 100644 (file)
--- a/include/wx/mac/pen.h
+++ b/include/wx/mac/pen.h
@@ -20,8 +20,6 @@
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 

-typedef long wxMACDash;
-

 class WXDLLEXPORT wxPen;
 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 class WXDLLEXPORT wxPen;
 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData


@@ -32,6 +30,8 @@ public:
     wxPenRefData(const wxPenRefData& data);
     ~wxPenRefData();
 
     wxPenRefData(const wxPenRefData& data);
     ~wxPenRefData();
 

+    wxPenRefData& operator=(const wxPenRefData& data);
+

 protected:
   int           m_width;
   int           m_style;
 protected:
   int           m_width;
   int           m_style;


@@ -39,7 +39,7 @@ protected:
   int           m_cap ;
   wxBitmap      m_stipple ;
   int           m_nbDash ;
   int           m_cap ;
   wxBitmap      m_stipple ;
   int           m_nbDash ;

-  wxMACDash *   m_dash ;
+  wxDash *      m_dash ;

   wxColour      m_colour;
 /* TODO: implementation
   WXHPEN        m_hPen;
   wxColour      m_colour;
 /* TODO: implementation
   WXHPEN        m_hPen;


@@ -56,7 +56,9 @@ public:
   wxPen();
   wxPen(const wxColour& col, int width, int style);
   wxPen(const wxBitmap& stipple, int width);
   wxPen();
   wxPen(const wxColour& col, int width, int style);
   wxPen(const wxBitmap& stipple, int width);

-  inline wxPen(const wxPen& pen) { Ref(pen); }
+  wxPen(const wxPen& pen)
+      : wxGDIObject()
+      { Ref(pen); }

   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }


@@ -81,10 +83,8 @@ public:
   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 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 ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
-    return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+  inline int GetDashes(wxDash **ptr) const {
+     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);

   }
 
   inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
   }
 
   inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };