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

fixing cast warnings on OSX 10.6

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-09-21 13:10:01 +00:00
parent 1437127330
commit aa308c95fe
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/glcmn.cpp
View File

@@ -70,13 +70,15 @@ bool wxGLCanvasBase::SetColour(const wxString& colour)
return false; return false;
#ifdef wxHAS_OPENGL_ES #ifdef wxHAS_OPENGL_ES
wxGLAPI::glColor3f(col.Red() / 256., col.Green() / 256., col.Blue() / 256.); wxGLAPI::glColor3f((GLfloat) (col.Red() / 256.), (GLfloat) (col.Green() / 256.),
(GLfloat) (col.Blue() / 256.));
#else #else
GLboolean isRGBA; GLboolean isRGBA;
glGetBooleanv(GL_RGBA_MODE, &isRGBA); glGetBooleanv(GL_RGBA_MODE, &isRGBA);
if ( isRGBA ) if ( isRGBA )
{ {
glColor3f(col.Red() / 256., col.Green() / 256., col.Blue() / 256.); glColor3f((GLfloat) (col.Red() / 256.), (GLfloat) (col.Green() / 256.),
(GLfloat) (col.Blue() / 256.));
} }
else // indexed colour else // indexed colour
{ {
@@ -217,7 +219,6 @@ void wxGLAPI::glFrustum(GLfloat left, GLfloat right, GLfloat bottom,
#endif #endif
} }
void wxGLAPI::glBegin(GLenum mode) void wxGLAPI::glBegin(GLenum mode)
{ {
#if wxUSE_OPENGL_EMULATION #if wxUSE_OPENGL_EMULATION