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

replaced all occurences of wxColourDatabase::FindColour() with Find(); minor code cleanup here and there

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-18 23:51:01 +00:00
parent 5d398dbae0
commit 564a150b1f
19 changed files with 158 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/x11/glcanvas.cpp
View File

@@ -138,28 +138,32 @@ void wxGLContext::SetCurrent()
void wxGLContext::SetColour(const wxChar *colour)
{
wxColour *the_colour = wxTheColourDatabase->FindColour(colour);
if(the_colour) {
GLboolean b;
glGetBooleanv(GL_RGBA_MODE, &b);
if(b) {
glColor3ub(the_colour->Red(),
the_colour->Green(),
the_colour->Blue());
} else {
wxColour the_colour = wxTheColourDatabase->Find(colour);
if(the_colour.Ok())
{
GLboolean b;
glGetBooleanv(GL_RGBA_MODE, &b);
if(b)
{
glColor3ub(the_colour.Red(),
the_colour.Green(),
the_colour.Blue());
}
else
{
#ifdef __WXMOTIF__
the_colour->AllocColour(m_window->GetXDisplay());
the_colour.AllocColour(m_window->GetXDisplay());
#else
the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
the_colour.CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
#endif
GLint pix = (GLint)the_colour->GetPixel();
if(pix == -1)
GLint pix = (GLint)the_colour.GetPixel();
if(pix == -1)
{
wxLogError(wxT("wxGLCanvas: cannot allocate color\n"));
return;
return;
}
glIndexi(pix);
}
glIndexi(pix);
}
}
}