Oops, I left an extra { in there.

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

diff --git a/include/wx/mac/pen.h b/include/wx/mac/pen.h
index 938908b56be96ad67d784c31278619e7fd13ef5a..50afa0d9c46a56675a657e74d2a5d1c46dd8cbbc 100644 (file)
--- a/include/wx/mac/pen.h
+++ b/include/wx/mac/pen.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pen.h
+// Name:        wx/mac/pen.h
 // Purpose:     wxPen class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "pen.h"
 #endif
 
@@ -20,8 +20,6 @@
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 
-typedef    long wxDash ;
-
 class WXDLLEXPORT wxPen;
 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
@@ -32,6 +30,8 @@ public:
     wxPenRefData(const wxPenRefData& data);
     ~wxPenRefData();
 
+    wxPenRefData& operator=(const wxPenRefData& data);
+
 protected:
   int           m_width;
   int           m_style;
@@ -54,9 +54,11 @@ class WXDLLEXPORT wxPen: public wxGDIObject
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
   wxPen();
-  wxPen(const wxColour& col, int width, int style);
+  wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
   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; }