fix wxGTK1 compilation after wxTextEntry DoGetValue() change

[wxWidgets.git] / src / gtk / pen.cpp

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index 2e38df095bea7802dbf3f96d506469f1c622dbb7..e118019c71a0a02df3cdd3b95628e67da80474b7 100644 (file)
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -31,7 +31,7 @@ public:
         m_style = wxPENSTYLE_SOLID;
         m_joinStyle = wxJOIN_ROUND;
         m_capStyle = wxCAP_ROUND;
         m_style = wxPENSTYLE_SOLID;
         m_joinStyle = wxJOIN_ROUND;
         m_capStyle = wxCAP_ROUND;

-        m_dash = (wxGTKDash*) NULL;
+        m_dash = NULL;

         m_countDashes = 0;
     }
 
         m_countDashes = 0;
     }
 


@@ -230,7 +230,7 @@ int wxPen::GetWidth() const
     return M_PENDATA->m_width;
 }
 
     return M_PENDATA->m_width;
 }
 

-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const

 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );