Change GetC to return an int so that it can return wxEOF on error.

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

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index cf1464fdb13360fe1e3f49798d776d82cb2106bc..91388c05a231f715d708df91fea9e140c4b1ab39 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKPENH__
 #define __GTKPENH__
 
 #ifndef __GTKPENH__
 #define __GTKPENH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -25,9 +20,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxPen;
+class WXDLLIMPEXP_CORE wxPen;

 
 

-#if defined(__WXGTK127__) || defined(__WXGTK20__)
+#if defined(__WXGTK127__)

 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;
 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;


@@ -37,30 +32,28 @@ typedef    gchar wxGTKDash;
 // wxPen
 //-----------------------------------------------------------------------------
 
 // wxPen
 //-----------------------------------------------------------------------------
 

-class wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxGDIObject

 {
 public:
     wxPen() { }
 {
 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 );
+    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 );
     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 SetCap( int capStyle );
     void SetJoin( int joinStyle );
     void SetStyle( int style );
     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );

-    
+

     wxColour &GetColour() const;
     int GetCap() const;
     int GetJoin() const;
     wxColour &GetColour() const;
     int GetCap() const;
     int GetJoin() const;


@@ -70,11 +63,11 @@ public:
     int GetDashCount() const;
     wxDash* GetDash() const;
 
     int GetDashCount() const;
     wxDash* GetDash() const;
 

-private:    
+private:

     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

-    
+

     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPen)
 };