Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed wxGLContext::SetColour() argument from wxChar* to wxString

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-19 11:54:36 +00:00
parent 09f0108224
commit 35f1f4f7ea
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/glcanvas.tex
View File

@@ -138,7 +138,7 @@ isn't yet shown at this moment.
\membersection{wxGLCanvas::SetColour}\label{wxglcanvassetcolour} \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 Sets the current colour for this window (using \texttt{glcolor3f()}), using the
wxWidgets colour database to find a named colour. wxWidgets colour database to find a named colour.

2
include/wx/glcanvas.h
View File

@@ -115,7 +115,7 @@ public:
// call glcolor() for the colour with the given name, return false if // call glcolor() for the colour with the given name, return false if
// colour not found // colour not found
bool SetColour(const wxChar *colour); bool SetColour(const wxString& colour);

2
include/wx/palmos/glcanvas.h
View File

@@ -35,7 +35,7 @@ public:
void SetCurrent(); void SetCurrent();
void SetColour(const wxChar *colour); void SetColour(const wxString& colour);
void SwapBuffers(); void SwapBuffers();

2
src/common/glcmn.cpp
View File

@@ -62,7 +62,7 @@ void wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
context.SetCurrent(*wx_static_cast(const wxGLCanvas *, this)); 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); wxColour col = wxTheColourDatabase->Find(colour);
if ( !col.Ok() ) if ( !col.Ok() )

2
src/palmos/glcanvas.cpp
View File

@@ -67,7 +67,7 @@ void wxGLContext::SetCurrent()
{ {
} }
void wxGLContext::SetColour(const wxChar *colour) void wxGLContext::SetColour(const wxString& colour)
{ {
} }