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

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

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 3f83b5ab43e900b2b1f9159ccdd952b98dccfea1..7b7937c264c86bbe09ff56f668a396549fc0e8bc 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/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(NO_GCC_PRAGMA)

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


@@ -38,7 +38,7 @@ class wxPen: public wxGDIObject
 public:
     wxPen() { }
     
 public:
     wxPen() { }
     

-    wxPen( const wxColour &colour, int width, int style );
+    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );

     wxPen( const wxBitmap &stipple, int width );
     ~wxPen();
     
     wxPen( const wxBitmap &stipple, int width );
     ~wxPen();