add more pure virtuals to wxBrushBase; fix the GetColour() functions to return a...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/brush.h b/include/wx/brush.h
index 033ace1dd8599e4100e5136da040d7ad6acddc9e..acddcd314c8a2c88d171f4c6aa68720f9bdf9d62 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -44,7 +44,14 @@ class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject
 public:
     virtual ~wxBrushBase() { }
 
+    virtual void SetColour(const wxColour& col) = 0;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;
+    virtual void SetStyle(wxBrushStyle style) = 0;
+    virtual void SetStipple(const wxBitmap& stipple) = 0;
+
+    virtual wxColour GetColour() const = 0;
     virtual wxBrushStyle GetStyle() const = 0;
+    virtual wxBitmap *GetStipple() const = 0;
 
     virtual bool IsHatch() const
         { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); }

diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index 3ee5c2f3499c9a11e6b69177847daa41be14e4f7..73f7c568f191b9bcaa4cbc5dd9625ebb457484a2 100644 (file)
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -46,7 +46,7 @@ public:
     void SetJoin(wxPenJoin join);
     void SetCap(wxPenCap cap);
 
-    wxColour& GetColour() const;
+    wxColour GetColour() const;
     int GetWidth() const;
     wxPenStyle GetStyle() const;
     wxPenJoin GetJoin() const;

diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h
index 0d0a46c7a5fbf37df5c1045e56a33f0bfeb97791..c2360bef88a6a8d05cf577e7695d58b2a1101d10 100644 (file)
--- a/include/wx/dfb/brush.h
+++ b/include/wx/dfb/brush.h
@@ -41,8 +41,8 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    virtual wxBrushStyle GetStyle() const;
-    wxColour& GetColour() const;
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;
     wxBitmap *GetStipple() const;
 
     void SetColour(const wxColour& col);

diff --git a/include/wx/dfb/pen.h b/include/wx/dfb/pen.h
index c9906dc2ae92fdea577d875cc767f2c01ee61557..27fe9a9be6d498814b67eac909f7b6971025d02f 100644 (file)
--- a/include/wx/dfb/pen.h
+++ b/include/wx/dfb/pen.h
@@ -51,7 +51,7 @@ public:
     void SetDashes(int number_of_dashes, const wxDash *dash);
     void SetStipple(const wxBitmap& stipple);
 
-    wxColour &GetColour() const;
+    wxColour GetColour() const;
     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 190978fcd889efb70e75ce62a781ccb82cea1eea..5c3e1d7ab693dc7c91456d82f792a31529a08a46 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -32,8 +32,8 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    virtual wxBrushStyle GetStyle() const;
-    wxColour &GetColour() const;
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;
     wxBitmap *GetStipple() const;
 
     void SetColour( const wxColour& col );

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 02baef39225e91ffd2256e5cc4e65e201bd9d4e5..2af7d460487e6bd46de499ee979727993b520b28 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -40,7 +40,7 @@ public:
     void SetDashes( int number_of_dashes, const wxDash *dash );
     void SetStipple(const wxBitmap& stipple);
 
-    wxColour &GetColour() const;
+    wxColour GetColour() const;
     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 8a0001685d4219def787d2cc2e8c8aa566b97f02..c7ea67babecba5ce1c9a3fa3495cb06b4793cb14 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -42,8 +42,8 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    virtual wxBrushStyle GetStyle() const;
-    wxColour &GetColour() const;
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;
     wxBitmap *GetStipple() const;
 
     void SetColour( const wxColour& col );

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index b54de75a51130df9e1714e3ece604d3ab61f0a33..887a77951cbd923b79c87b92f51bcde1eeb6a0ba 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -54,7 +54,7 @@ public:
     void SetDashes( int number_of_dashes, const wxDash *dash );
     void SetStipple(const wxBitmap& stipple);
 
-    wxColour &GetColour() const;
+    wxColour GetColour() const;
     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index c59a4af24fe4e7b2566f5209b14bc273d6fdc5a3..0d4d1c558630d50ee4101c96e070274b0c81818e 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -38,8 +38,8 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    const wxColour& GetColour() const ;
-    virtual wxBrushStyle GetStyle() const ;
+    wxColour GetColour() const;
+    wxBrushStyle GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
 protected:

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index 13332a3077da0ce19b0ff6ea2d0854b6bd7437ad..3807aa523ea6781d59f947e01ba863110e962f24 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -43,7 +43,7 @@ public:
     void SetJoin(wxPenJoin join)  ;
     void SetCap(wxPenCap cap)  ;
 
-    wxColour& GetColour() const ;
+    wxColour GetColour() const ;
     int GetWidth() const;
     wxPenStyle GetStyle() const;
     wxPenJoin GetJoin() const;

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 27d2d0a605df21c6ff2c9feea218e8c2d5c18fb2..6dd2b763a64f93e0da99fe2bea25eec72386b819 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -40,8 +40,8 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const;
 
-    virtual wxBrushStyle GetStyle() const;
-    wxColour &GetColour() const;
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;
     wxBitmap *GetStipple() const;
 
     void SetColour(const wxColour& col);

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index 3be08b3293c8e0234e187b14b681f284bf75e3c6..cd7188c4650a20bc1b62cffd165e046f26f470b7 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -50,7 +50,7 @@ public:
     void SetDashes(int number_of_dashes, const wxDash *dash);
     void SetStipple(const wxBitmap& stipple);
 
-    wxColour &GetColour() const;
+    wxColour GetColour() const;
     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 945b13c80abddcac96c203dd7bd883f7f3d39c41..3d1c7e3ae15f53d14dda634f03acb08adea968a7 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -40,7 +40,7 @@ public:
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
-    virtual wxBrushStyle GetStyle() const;
+    wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
     // return the HBRUSH for this brush

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 412281e08be1d8747a4654b975c98fac7d141d0f..0cff049e87e7529eef2d5f8277eb33976adc0b93 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -45,7 +45,7 @@ public:
     void SetJoin(wxPenJoin join);
     void SetCap(wxPenCap cap);
 
-    wxColour& GetColour() const;
+    wxColour GetColour() const;
     int GetWidth() const;
     wxPenStyle GetStyle() const;
     wxPenJoin GetJoin() const;

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index a7326041fd096c48387a8cd74b9567c8865cb7f3..c3dcfe85a3126bd8c1a469d752fc700b409ae799 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -36,7 +36,7 @@ public:
     virtual void SetStipple(const wxBitmap& rStipple);
 
     wxColour GetColour(void) const;
-    virtual wxBrushStyle GetStyle(void) const;
+    wxBrushStyle GetStyle(void) const;
     wxBitmap* GetStipple(void) const;
     int       GetPS(void) const;
 

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index dfcdb9f12f7be8f9e2f15801fa7a75da78e7ccac..f05f6382f6cfbd17dfde32d069e9d45dbe7d056a 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -58,7 +58,7 @@ public:
     void SetCap(wxPenCap nCap);
     void SetPS(HPS hPS);
 
-    wxColour& GetColour(void) const;
+    wxColour GetColour(void) const;
     int       GetWidth(void) const;
     wxPenStyle GetStyle(void) const;
     wxPenJoin  GetJoin(void) const;

diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h
index 4d65402d4910b8cf8d32a639e8554668327b0676..ba55d5bad7de96364a0e4235c890c3636adc8cba 100644 (file)
--- a/include/wx/palmos/brush.h
+++ b/include/wx/palmos/brush.h
@@ -42,7 +42,7 @@ public:
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
-    virtual wxBrushStyle GetStyle() const;
+    wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
     // return the HBRUSH for this brush

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 379f560c445076ab462b4b6f1bca543f799e349f..36c2bd1f7a025b36faea0e119e82e43be10abff6 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -77,7 +77,7 @@ public:
     virtual void SetJoin(wxPenJoin join) = 0;
     virtual void SetCap(wxPenCap cap) = 0;
 
-    virtual wxColour& GetColour() const = 0;
+    virtual wxColour GetColour() const = 0;
     virtual wxBitmap *GetStipple() const = 0;
     virtual wxPenStyle GetStyle() const = 0;
     virtual wxPenJoin GetJoin() const = 0;

diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index b2e66276517dec5e34b6acfdef65826c1d886e80..1ca87cab93d9ecdcaf255fb322180fe550ed9b06 100644 (file)
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -41,8 +41,8 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    virtual wxBrushStyle GetStyle() const;
-    wxColour &GetColour() const;
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;
     wxBitmap *GetStipple() const;
 
     void SetColour( const wxColour& col );

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index fd2e6ad4db2469f1337879f3503aa90fb367b6a2..9e77f0daa078ec13c8afcb685ef46274e27517ac 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -54,7 +54,7 @@ public:
     void SetDashes( int number_of_dashes, const wxDash *dash );
     void SetStipple( const wxBitmap& stipple );
 
-    wxColour &GetColour() const;
+    wxColour GetColour() const;
     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;

diff --git a/interface/brush.h b/interface/brush.h
index edf7beb6f8dded414f0ebfd1f307d845485047cf..f98b98525fbde881f3116ced1c753581a45dd6b1 100644 (file)
--- a/interface/brush.h
+++ b/interface/brush.h
@@ -137,7 +137,7 @@ public:
 
         @see SetColour()
     */
-    wxColour& GetColour() const;
+    virtual wxColour GetColour() const;
 
     /**
         Gets a pointer to the stipple bitmap. If the brush does not have a wxBRUSHSTYLE_STIPPLE
@@ -145,7 +145,7 @@ public:
 
         @see SetStipple()
     */
-    wxBitmap* GetStipple() const;
+    virtual wxBitmap* GetStipple() const;
 
     /**
         Returns the brush style, one of the ::wxBrushStyle values.
@@ -174,9 +174,8 @@ public:
 
         @see GetColour()
     */
-    void SetColour(wxColour& colour);
-    void SetColour(const wxString& colourName);
-    void SetColour(unsigned char red, unsigned char green, unsigned char blue);
+    virtual void SetColour(wxColour& colour);
+    virtual void SetColour(unsigned char red, unsigned char green, unsigned char blue);
     //@}
 
     /**
@@ -191,7 +190,7 @@ public:
 
         @see wxBitmap
     */
-    void SetStipple(const wxBitmap& bitmap);
+    virtual void SetStipple(const wxBitmap& bitmap);
 
     /**
         Sets the brush style.
@@ -201,7 +200,7 @@ public:
 
         @see GetStyle()
     */
-    void SetStyle(wxBrushStyle style);
+    virtual void SetStyle(wxBrushStyle style);
 
     /**
         Inequality operator.

diff --git a/interface/pen.h b/interface/pen.h
index 9f27ffa8358d69e0cb3f4eb0e58548f60b58e1e2..a8877df3e21ff5f3736d36d50e9e79ee5ef5fd3b 100644 (file)
--- a/interface/pen.h
+++ b/interface/pen.h
@@ -199,14 +199,14 @@ public:
 
         @see SetCap()
     */
-    wxPenCap GetCap() const;
+    virtual wxPenCap GetCap() const;
 
     /**
         Returns a reference to the pen colour.
 
         @see SetColour()
     */
-    wxColour GetColour() const;
+    virtual wxColour GetColour() const;
 
     /**
         Gets an array of dashes (defined as char in X, DWORD under Windows).
@@ -216,7 +216,7 @@ public:
 
         @see SetDashes()
     */
-    int GetDashes(wxDash** dashes) const;
+    virtual int GetDashes(wxDash** dashes) const;
 
     /**
         Returns the pen join style, which may be one of @b wxJOIN_BEVEL, @b
@@ -225,28 +225,28 @@ public:
 
         @see SetJoin()
     */
-    wxPenJoin GetJoin() const;
+    virtual wxPenJoin GetJoin() const;
 
     /**
         Gets a pointer to the stipple bitmap.
 
         @see SetStipple()
     */
-    wxBitmap* GetStipple() const;
+    virtual wxBitmap* GetStipple() const;
 
     /**
         Returns the pen style.
 
         @see wxPen(), SetStyle()
     */
-    wxPenStyle GetStyle() const;
+    virtual wxPenStyle GetStyle() const;
 
     /**
         Returns the pen width.
 
         @see SetWidth()
     */
-    int GetWidth() const;
+    virtual int GetWidth() const;
 
     /**
         Returns @true if the pen is initialised.
@@ -260,7 +260,7 @@ public:
 
         @see GetCap()
     */
-    void SetCap(wxPenCap capStyle);
+    virtual void SetCap(wxPenCap capStyle);
 
     //@{
     /**
@@ -268,10 +268,8 @@ public:
 
         @see GetColour()
     */
-    void SetColour(wxColour& colour);
-    void SetColour(const wxString& colourName);
-    void SetColour(unsigned char red, unsigned char green,
-                   unsigned char blue);
+    virtual void SetColour(wxColour& colour);
+    virtual void SetColour(unsigned char red, unsigned char green, unsigned char blue);
     //@}
 
     /**
@@ -283,7 +281,7 @@ public:
 
         @see GetDashes()
     */
-    void SetDashes(int n, wxDash* dashes);
+    virtual void SetDashes(int n, wxDash* dashes);
 
     /**
         Sets the pen join style, which may be one of @b wxJOIN_BEVEL, @b wxJOIN_ROUND
@@ -292,28 +290,28 @@ public:
 
         @see GetJoin()
     */
-    void SetJoin(wxPenJoin join_style);
+    virtual void SetJoin(wxPenJoin join_style);
 
     /**
         Sets the bitmap for stippling.
 
         @see GetStipple()
     */
-    void SetStipple(wxBitmap* stipple);
+    virtual void SetStipple(wxBitmap* stipple);
 
     /**
         Set the pen style.
 
         @see wxPen()
     */
-    void SetStyle(wxPenStyle style);
+    virtual void SetStyle(wxPenStyle style);
 
     /**
         Sets the pen width.
 
         @see GetWidth()
     */
-    void SetWidth(int width);
+    virtual void SetWidth(int width);
 
     /**
         Inequality operator.
@@ -336,57 +334,57 @@ public:
 };
 
 /**
-    FIXME
+    An empty pen.
 */
 wxPen wxNullPen;
 
 /**
-    FIXME
+    Red pen.
 */
 wxPen wxRED_PEN;
 
 /**
-    FIXME
+    Cyan pen.
 */
 wxPen wxCYAN_PEN;
 
 /**
-    FIXME
+    Green pen.
 */
 wxPen wxGREEN_PEN;
 
 /**
-    FIXME
+    Black pen.
 */
 wxPen wxBLACK_PEN;
 
 /**
-    FIXME
+    White pen.
 */
 wxPen wxWHITE_PEN;
 
 /**
-    FIXME
+    Transparent pen.
 */
 wxPen wxTRANSPARENT_PEN;
 
 /**
-    FIXME
+    Black dashed pen.
 */
 wxPen wxBLACK_DASHED_PEN;
 
 /**
-    FIXME
+    Grey pen.
 */
 wxPen wxGREY_PEN;
 
 /**
-    FIXME
+    Medium-grey pen.
 */
 wxPen wxMEDIUM_GREY_PEN;
 
 /**
-    FIXME
+    Light-grey pen.
 */
 wxPen wxLIGHT_GREY_PEN;
 

diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm
index d94b138c1a791af272214db3e8fa336c0fc00271..0f08a1dc3e0d03092862098422d8b439635aa7d3 100644 (file)
--- a/src/cocoa/pen.mm
+++ b/src/cocoa/pen.mm
@@ -327,7 +327,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
     M_PENDATA->SetStipple(Stipple);
 }
 
-wxColour& wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour);
 }

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index efbd60cbbce83df5b8736db6243f21b6f7891872..b4e4d058c08a7739dd4b341d9d9abc0111370d50 100644 (file)
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -96,7 +96,7 @@ wxBrushStyle wxBrush::GetStyle() const
     return M_BRUSHDATA->m_style;
 }
 
-wxColour& wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
 

diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index c71488b5875281abaa42ad9ffe2e68b9383ddcb4..4db8f6df5514e030702cb2d52741ca58e447d59f 100644 (file)
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -183,7 +183,7 @@ int wxPen::GetWidth() const
     return 1;
 }
 
-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index a1a29fc190c7ca4c901089b4fc4be63b21c8c3f1..c0d8490553df574e6bfd59f479d3a71af73da64a 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -109,7 +109,7 @@ wxBrushStyle wxBrush::GetStyle() const
     return M_BRUSHDATA->m_style;
 }
 
-wxColour &wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
 

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index 2e38df095bea7802dbf3f96d506469f1c622dbb7..06c0d8c1ede4261a0a28ffdbc2a87e9f7ea1ca0d 100644 (file)
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -230,7 +230,7 @@ int wxPen::GetWidth() const
     return M_PENDATA->m_width;
 }
 
-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index b8dfff43519186c2e489769684a03af617f20724..eb5606cfea9b6e3eeb666913bf80aa7257da81eb 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -116,7 +116,7 @@ wxBrushStyle wxBrush::GetStyle() const
     return M_BRUSHDATA->m_style;
 }
 
-wxColour &wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
 

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index e7202df6e7030b1defa8f7eeb44375d76177d02e..2ca4c94bd79838e785fc60c309c7ef0184ceb26e 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -230,7 +230,7 @@ int wxPen::GetWidth() const
     return M_PENDATA->m_width;
 }
 
-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index 46132211bec5cb8650b2e4473ba36c0361600ebe..84dd60d6e9b4ccc0473f710e7888c8478f3f3bbb 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -138,7 +138,7 @@ wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
 // wxBrush accessors
 // ----------------------------------------------------------------------------
 
-const wxColour& wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
 

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index 8d6461dd9746fcf3b0bb3f81aff42af7e6068164..260f1abc8280e34c462f84aea026b9ee11519f68 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -162,7 +162,7 @@ bool wxPen::operator==(const wxPen& pen) const
     return m_refData ? penData && *M_PENDATA == *penData : !penData;
 }
 
-wxColour& wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index 7735469cd160958d0a73a693e213a0733e672087..c5f2b03cc083c33d28cce3f451d33f45bc39a878 100644 (file)
--- a/src/mgl/brush.cpp
+++ b/src/mgl/brush.cpp
@@ -182,7 +182,7 @@ wxBrushStyle wxBrush::GetStyle() const
     return M_BRUSHDATA->m_style;
 }
 
-wxColour &wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
 

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 64fdb7bcef0fd6ad6e373557a551002cc8da2e89..10af3215728c1df9bbf59c54778a0df9fe2e1a6b 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -251,7 +251,7 @@ int wxPen::GetWidth() const
     return M_PENDATA->m_width;
 }
 
-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index ae1b3d63b835d0f374ee9d2588af674c51400e4f..ae66559cec4bc90fc536338c4763fc4d5df8c884 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -540,7 +540,7 @@ void wxPen::SetCap(wxPenCap cap)
     M_PENDATA->SetCap(cap);
 }
 
-wxColour& wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index effcfc0cbe484b33b74511675ea428d11912b219..6dd16877ede3f56f152a2ad4f918c99b83f2e66d 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -479,7 +479,7 @@ void wxPen::SetCap(
     RealizeResource();
 } // end of wxPen::SetCap
 
-wxColour& wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 

diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index f3a0ecd8cb413e98c9edb5511b936d197b4a4e58..71046981e4868ea2f146bf9de23f57b3dbefa678 100644 (file)
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -117,7 +117,7 @@ wxBrushStyle wxBrush::GetStyle() const
     return M_BRUSHDATA->m_style;
 }
 
-wxColour &wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
 

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index c6f93665872eeaa139f86fe4aae37e81566bbe91..4e8be7e16885f229040664a28a7b7cbd5d7c9ae0 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -223,7 +223,7 @@ int wxPen::GetWidth() const
     return M_PENDATA->m_width;
 }
 
-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );