set eol-style

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

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 46d954158f6a0ff9faef5b870f148231a2821e97..ccb6310eb552db6eb74bde9a1d7fb53034cb306d 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -1,30 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pen.h
+// Name:        wx/x11/pen.h
 // Purpose:     wxPen class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#ifdef __GNUG__
-#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_FWD_CORE wxPen;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 typedef char wxX11Dash;
 
@@ -32,30 +29,30 @@ 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();
-    
-    wxPen( const wxPen& pen ) { Ref(pen); }
-    wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
-    
-    bool Ok() const { return m_refData != NULL; }
-    
+
+    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
+    wxPen( const wxBitmap &stipple, int width );
+    virtual ~wxPen();
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
+
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     void SetColour( const wxColour &colour );
-    void SetColour( int red, int green, int blue );
+    void SetColour( unsigned char red, unsigned char green, unsigned char blue );
     void SetCap( int capStyle );
     void SetJoin( int joinStyle );
     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,12 +61,13 @@ public:
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
+    wxBitmap* GetStipple() const;
 
-private:    
+protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-    
+
     DECLARE_DYNAMIC_CLASS(wxPen)
 };