Output the extracted number from wxString::ToXXX() even if it returns false.

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

diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp
index ff3aa286018eae093fbdf27b2c2ac62cb66b6ee9..675f512a4d26ed96b753ac6d291577e8cbec0434 100644 (file)
--- a/src/common/glcmn.cpp
+++ b/src/common/glcmn.cpp
@@ -57,12 +57,12 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
     // although on MSW it works even if the window is still hidden, it doesn't
     // work in other ports (notably X11-based ones) and documentation mentions
     // that SetCurrent() can only be called for a shown window, so check for it
     // although on MSW it works even if the window is still hidden, it doesn't
     // work in other ports (notably X11-based ones) and documentation mentions
     // that SetCurrent() can only be called for a shown window, so check for it

-    wxASSERT_MSG( IsShownOnScreen(), _T("can't make hidden GL canvas current") );
+    wxASSERT_MSG( IsShownOnScreen(), wxT("can't make hidden GL canvas current") );

 
     return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));
 }
 
 
     return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));
 }
 

-#ifndef wxHAS_OPENGL_ES 
+#ifndef wxHAS_OPENGL_ES

 bool wxGLCanvasBase::SetColour(const wxString& colour)
 {
     wxColour col = wxTheColourDatabase->Find(colour);
 bool wxGLCanvasBase::SetColour(const wxString& colour)
 {
     wxColour col = wxTheColourDatabase->Find(colour);