applied heavily modified patch 1116702: support for specifying disabled toolbar image...

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

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index cf1464fdb13360fe1e3f49798d776d82cb2106bc..e71e01253fb74764a81a5b97023bdb8def977d1c 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pen.h
+// Name:        wx/gtk/pen.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,7 +11,7 @@
 #ifndef __GTKPENH__
 #define __GTKPENH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -42,10 +42,12 @@ class wxPen: public wxGDIObject
 public:
     wxPen() { }
     
-    wxPen( const wxColour &colour, int width, int style );
+    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     ~wxPen();
     
-    wxPen( const wxPen& pen ) { Ref(pen); }
+    wxPen( const wxPen& pen )
+        : wxGDIObject()
+        { Ref(pen); }
     wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
     
     bool Ok() const { return m_refData != NULL; }