Applied #11106: wxGenericDirCtrl can get into a state where it will no longer expand

[wxWidgets.git] / src / common / colourcmn.cpp

diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index 99243dd383ee5a444f8fcb103dc1750b62ccf4ad..8fa9c927c213cbaf06c1d0ad46296bbeccef9600 100644 (file)
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -110,7 +110,7 @@ wxString wxColourBase::GetAsString(long flags) const
     if ( (flags & wxC2S_NAME) && isOpaque )
     {
         colName = wxTheColourDatabase->FindName(
-                    wx_static_cast(const wxColour &, *this)).MakeLower();
+                    static_cast<const wxColour &>(*this)).MakeLower();
     }
 
     if ( colName.empty() )
@@ -173,7 +173,7 @@ wxString wxToString(const wxColourBase& col)
 
 bool wxFromString(const wxString& str, wxColourBase *col)
 {
-    wxCHECK_MSG( col, false, _T("NULL output parameter") );
+    wxCHECK_MSG( col, false, wxT("NULL output parameter") );
 
     if ( str.empty() )
     {