wxXML load/save improvements: added ability to not ignore whitespace and specify...

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

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 40f0ccf341429f6ae74bb358066474314530a828..eeff1b0756a134e8527fe2b8477d67ae00238137 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -36,10 +36,7 @@ public:
 
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     wxPen( const wxBitmap &stipple, int width );
 
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     wxPen( const wxBitmap &stipple, int width );

-    ~wxPen();
-
-    wxPen( const wxPen& pen ) { Ref(pen); }
-    wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
+    virtual ~wxPen();

 
     bool Ok() const { return m_refData != NULL; }
 
 
     bool Ok() const { return m_refData != NULL; }
 


@@ -47,7 +44,7 @@ public:
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     void SetColour( const wxColour &colour );
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     void SetColour( const wxColour &colour );

-    void SetColour( const unsigned char red, const unsigned char green, const unsigned char 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 SetCap( int capStyle );
     void SetJoin( int joinStyle );
     void SetStyle( int style );


@@ -65,7 +62,7 @@ public:
     wxDash* GetDash() const;
     wxBitmap* GetStipple() const;
 
     wxDash* GetDash() const;
     wxBitmap* GetStipple() const;
 

-private:
+protected:

     // 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;