Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 46d954158f6a0ff9faef5b870f148231a2821e97..7b7937c264c86bbe09ff56f668a396549fc0e8bc 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_
 
 #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
 

+#include "wx/gdicmn.h"

 #include "wx/gdiobj.h"
 #include "wx/gdiobj.h"

-#include "wx/colour.h"
-#include "wx/bitmap.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxPen;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxPen;

+class wxColour;
+class wxBitmap;

 
 typedef char wxX11Dash;
 
 
 typedef char wxX11Dash;
 


@@ -37,7 +38,8 @@ 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 wxPen& pen ) { Ref(pen); }
     ~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 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;
     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;
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;

+    wxBitmap* GetStipple() const;

 
 private:    
     // ref counting code
 
 private:    
     // ref counting code