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

diff --git a/docs/latex/wx/glcanvas.tex b/docs/latex/wx/glcanvas.tex
index b94a4805c2c159e6cba2a82e3098dec28d8a9cba..1c2f631b4cf47a91210b6a1487869033b0f29049 100644 (file)
--- 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 2a40221169142e0c36364ee3b840621cdec894ac..7257bbf35a6f04b21c222d1521accfb319ca8fe3 100644 (file)
--- 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 4aa7df791da721cf7eceaacc85e04976dda17058..9a6097c9e6cf045f1e3d54a9db7ec7cd51fb7afb 100644 (file)
--- 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 faa42827c15ab32fad333a3aabcb8c4de9eee148..0d85eab14c8cbacac696edb84566d2e3d9f7a60c 100644 (file)
--- 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 b7c476ab775e4fb8d4dc34bd9e2b35445c706be2..7572deaaa7c52e21c8807c963e7593ee2f10d2c7 100644 (file)
--- 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)
 {
 }