X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdbd4e96121a470b518420cff4c2dfea20f2b7a6..fa3b08caf17a6310540d623b6ce508c201efb9a5:/include/wx/gtk/pen.h

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 38ae0b9a98..b273d2c6df 100644
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -7,21 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKPENH__
-#define __GTKPENH__
+#ifndef _WX_GTK_PEN_H_
+#define _WX_GTK_PEN_H_
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPen;
-
 typedef    gint8 wxGTKDash;
 
 //-----------------------------------------------------------------------------
@@ -34,14 +25,10 @@ public:
     wxPen() { }
 
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
-    ~wxPen();
-
-    wxPen( const wxPen& pen )
-        : wxGDIObject()
-        { Ref(pen); }
-    wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
+    virtual ~wxPen();
 
-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
@@ -63,7 +50,7 @@ public:
     int GetDashCount() const;
     wxDash* GetDash() const;
 
-private:
+protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
@@ -71,4 +58,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
-#endif // __GTKPENH__
+#endif // _WX_GTK_PEN_H_