From aa308c95fe2d19c6ca63d5c814618c4928c7babf Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 21 Sep 2009 13:10:01 +0000 Subject: [PATCH] fixing cast warnings on OSX 10.6 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/glcmn.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp index 61ad338483..bcefc2c8fa 100644 --- a/src/common/glcmn.cpp +++ b/src/common/glcmn.cpp @@ -70,13 +70,15 @@ bool wxGLCanvasBase::SetColour(const wxString& colour) return false; #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 GLboolean isRGBA; glGetBooleanv(GL_RGBA_MODE, &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 { @@ -217,7 +219,6 @@ void wxGLAPI::glFrustum(GLfloat left, GLfloat right, GLfloat bottom, #endif } - void wxGLAPI::glBegin(GLenum mode) { #if wxUSE_OPENGL_EMULATION