Update to Scintilla 1.48

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

diff --git a/include/wx/mac/pen.h b/include/wx/mac/pen.h
index 938908b56be96ad67d784c31278619e7fd13ef5a..f13fcdfdacc4ca94a0d332f1d0c376db8c3b9cd5 100644 (file)
--- a/include/wx/mac/pen.h
+++ b/include/wx/mac/pen.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "pen.h"
 #endif
 
 #pragma interface "pen.h"
 #endif
 


@@ -20,8 +20,6 @@
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 

-typedef    long wxDash ;
-

 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;


@@ -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; }