removed wxUSE_MENU_CALLBACK references: the code inside the #if couldn't compile...

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

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 46d954158f6a0ff9faef5b870f148231a2821e97..0eb56b2bf5af7b0ab7b3b0926a13a7d43cd02931 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -12,19 +12,20 @@
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "pen.h"
 #endif
 
+#include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
-#include "wx/colour.h"
-#include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class wxPen;
+class WXDLLIMPEXP_CORE wxPen;
+class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_CORE wxBitmap;
 
 typedef char wxX11Dash;
 
@@ -32,12 +33,13 @@ typedef char wxX11Dash;
 // wxPen
 //-----------------------------------------------------------------------------
 
-class wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
 {
 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 wxPen& pen ) { Ref(pen); }
@@ -55,7 +57,8 @@ public:
     void SetStyle( int style );
     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );
-    
+    void SetStipple( wxBitmap *stipple );
+
     wxColour &GetColour() const;
     int GetCap() const;
     int GetJoin() const;
@@ -64,6 +67,7 @@ public:
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
+    wxBitmap* GetStipple() const;
 
 private:    
     // ref counting code