A couple more 'int' to UWORD conversions I had not merged into my previous checkin.

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

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index d6c4d632b8d4a39941f2f22f410c5ba10f4bee60..20d09c2ed4c541d9a72cb7782f49b8705fa64d74 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -2,10 +2,9 @@
 // Name:        pen.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        pen.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -28,43 +27,50 @@
 
 class wxPen;
 
 
 class wxPen;
 

+#if defined(__WXGTK127__) || defined(__WXGTK20__)
+typedef    gint8 wxGTKDash;
+#else
+typedef    gchar wxGTKDash;
+#endif
+

 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 class wxPen: public wxGDIObject
 {
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 class wxPen: public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxPen)
-
-  public:
-  
-    wxPen(void);
+public:
+    wxPen();

     wxPen( const wxColour &colour, int width, int style );
     wxPen( const wxColour &colour, int width, int style );

-    wxPen( const wxString &colourName, int width, int style );

     wxPen( const wxPen& pen );
     wxPen( const wxPen& pen );

-    wxPen( const wxPen* pen );
-    ~wxPen(void);
+    ~wxPen();

     wxPen& operator = ( const wxPen& pen );
     wxPen& operator = ( const wxPen& pen );

-    bool operator == ( const wxPen& pen );
-    bool operator != ( const wxPen& pen );
-    
+    bool operator == ( const wxPen& pen ) const;
+    bool operator != ( const wxPen& pen ) const;
+

     void SetColour( const wxColour &colour );
     void SetColour( const wxColour &colour );

-    void SetColour( const wxString &colourName );

     void SetColour( int red, int green, int blue );
     void SetCap( int capStyle );
     void SetJoin( int joinStyle );
     void SetStyle( int style );
     void SetWidth( int width );
     void SetColour( int red, int green, int blue );
     void SetCap( int capStyle );
     void SetJoin( int joinStyle );
     void SetStyle( int style );
     void SetWidth( int width );

-    wxColour &GetColour(void) const;
-    int GetCap(void) const;
-    int GetJoin(void) const;
-    int GetStyle(void) const;
-    int GetWidth(void) const;
-    bool Ok(void) const;
+    void SetDashes( int number_of_dashes, const wxDash *dash );

     
     

-    void Unshare(void);
+    wxColour &GetColour() const;
+    int GetCap() const;
+    int GetJoin() const;
+    int GetStyle() const;
+    int GetWidth() const;
+    int GetDashes(wxDash **ptr) const;
+    int GetDashCount() const;
+    wxDash* GetDash() const;

     
     

-    // no data :-)
+    bool Ok() const;
+
+    void Unshare();
+
+private:    
+    DECLARE_DYNAMIC_CLASS(wxPen)

 };
 
 #endif // __GTKPENH__
 };
 
 #endif // __GTKPENH__