Added paragraph symbol font (Get/SetSymbolFont in attribute)

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

diff --git a/include/wx/mac/classic/pen.h b/include/wx/mac/classic/pen.h
index 50afa0d9c46a56675a657e74d2a5d1c46dd8cbbc..131cb24474a65406020b74bdfa7f4c6a365a60b8 100644 (file)
--- a/include/wx/mac/classic/pen.h
+++ b/include/wx/mac/classic/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/pen.h
+// Name:        wx/mac/classic/pen.h

 // Purpose:     wxPen class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxPen class
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "pen.h"
-#endif
-

 #include "wx/gdiobj.h"
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 #include "wx/gdiobj.h"
 #include "wx/colour.h"
 #include "wx/bitmap.h"


@@ -28,7 +24,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);

-    ~wxPenRefData();
+    virtual ~wxPenRefData();

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


@@ -56,14 +52,10 @@ public:
   wxPen();
   wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
   wxPen(const wxBitmap& stipple, int width);
   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) { return m_refData == pen.m_refData; }
-  inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; }
+  virtual ~wxPen();
+
+  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 bool Ok() const { return (m_refData != NULL) ; }
 
 
   virtual bool Ok() const { return (m_refData != NULL) ; }