Use theme and HTML Help headers from Wine (with permission)

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

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index d6e5f02d1d405aab6dd88739c7bb5914737f399b..3b69b3d054405d2e35f3d6ae3dd1839e6eb4f383 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.h
+// Name:        wx/mgl/pen.h

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -11,7 +11,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
 


@@ -36,7 +36,7 @@ class WXDLLEXPORT 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(const wxPen& pen);
     ~wxPen() {}
     wxPen(const wxBitmap& stipple, int width);
     wxPen(const wxPen& pen);
     ~wxPen() {}