From 35f1f4f7ea3c88fa680ba69de487f67967ac51d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 19 Jun 2007 11:54:36 +0000 Subject: [PATCH] changed wxGLContext::SetColour() argument from wxChar* to wxString git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/glcanvas.tex | 2 +- include/wx/glcanvas.h | 2 +- include/wx/palmos/glcanvas.h | 2 +- src/common/glcmn.cpp | 2 +- src/palmos/glcanvas.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/latex/wx/glcanvas.tex b/docs/latex/wx/glcanvas.tex index b94a4805c2..1c2f631b4c 100644 --- a/docs/latex/wx/glcanvas.tex +++ b/docs/latex/wx/glcanvas.tex @@ -138,7 +138,7 @@ isn't yet shown at this moment. \membersection{wxGLCanvas::SetColour}\label{wxglcanvassetcolour} -\func{void}{SetColour}{\param{const char*}{ colour}} +\func{void}{SetColour}{\param{const wxString\&}{ colour}} Sets the current colour for this window (using \texttt{glcolor3f()}), using the wxWidgets colour database to find a named colour. diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h index 2a40221169..7257bbf35a 100644 --- a/include/wx/glcanvas.h +++ b/include/wx/glcanvas.h @@ -115,7 +115,7 @@ public: // call glcolor() for the colour with the given name, return false if // colour not found - bool SetColour(const wxChar *colour); + bool SetColour(const wxString& colour); diff --git a/include/wx/palmos/glcanvas.h b/include/wx/palmos/glcanvas.h index 4aa7df791d..9a6097c9e6 100644 --- a/include/wx/palmos/glcanvas.h +++ b/include/wx/palmos/glcanvas.h @@ -35,7 +35,7 @@ public: void SetCurrent(); - void SetColour(const wxChar *colour); + void SetColour(const wxString& colour); void SwapBuffers(); diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp index faa42827c1..0d85eab14c 100644 --- a/src/common/glcmn.cpp +++ b/src/common/glcmn.cpp @@ -62,7 +62,7 @@ void wxGLCanvasBase::SetCurrent(const wxGLContext& context) const context.SetCurrent(*wx_static_cast(const wxGLCanvas *, this)); } -bool wxGLCanvasBase::SetColour(const wxChar *colour) +bool wxGLCanvasBase::SetColour(const wxString& colour) { wxColour col = wxTheColourDatabase->Find(colour); if ( !col.Ok() ) diff --git a/src/palmos/glcanvas.cpp b/src/palmos/glcanvas.cpp index b7c476ab77..7572deaaa7 100644 --- a/src/palmos/glcanvas.cpp +++ b/src/palmos/glcanvas.cpp @@ -67,7 +67,7 @@ void wxGLContext::SetCurrent() { } -void wxGLContext::SetColour(const wxChar *colour) +void wxGLContext::SetColour(const wxString& colour) { } -- 2.50.0