compilation fix for wxUSE_RESOURCE_LOADING_IN_MSW == 0

[wxWidgets.git] / src / msw / glcanvas.cpp

diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index b93f1995cbb2776b6343430b2aec5fc48c70420a..44ac48b0b96939d6e5879cb90a5238449719e8d7 100644 (file)
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -104,7 +104,7 @@ void wxGLContext::SetCurrent()
   */
 }
 
   */
 }
 

-void wxGLContext::SetColour(const char *colour)
+void wxGLContext::SetColour(const wxChar *colour)

 {
   float r = 0.0;
   float g = 0.0;
 {
   float r = 0.0;
   float g = 0.0;


@@ -399,7 +399,6 @@ static void AdjustPFDForAttributes(PIXELFORMATDESCRIPTOR& pfd, int *attribList)
 
 void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC)
 {
 
 void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC)
 {

-  int pixelFormat;

   PIXELFORMATDESCRIPTOR pfd = {
         sizeof(PIXELFORMATDESCRIPTOR),    /* size */
         1,                /* version */
   PIXELFORMATDESCRIPTOR pfd = {
         sizeof(PIXELFORMATDESCRIPTOR),    /* size */
         1,                /* version */


@@ -423,13 +422,13 @@ void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC)
 
   AdjustPFDForAttributes(pfd, attribList);
 
 
   AdjustPFDForAttributes(pfd, attribList);
 

-  pixelFormat = ChoosePixelFormat((HDC) m_hDC, &pfd);
+  int pixelFormat = ChoosePixelFormat((HDC) m_hDC, &pfd);

   if (pixelFormat == 0) {
   if (pixelFormat == 0) {

-    wxLogWarning(_("ChoosePixelFormat failed."));
+    wxLogLastError(_T("ChoosePixelFormat"));

   }
   else {
   }
   else {

-    if (SetPixelFormat((HDC) m_hDC, pixelFormat, &pfd) != TRUE) {
-      wxLogWarning(_("SetPixelFormat failed."));
+    if ( !::SetPixelFormat((HDC) m_hDC, pixelFormat, &pfd) ) {
+      wxLogLastError(_T("SetPixelFormat"));

     }
   }
 }
     }
   }
 }


@@ -523,7 +522,7 @@ void wxGLCanvas::SetCurrent()
   }
 }
 
   }
 }
 

-void wxGLCanvas::SetColour(const char *colour)
+void wxGLCanvas::SetColour(const wxChar *colour)

 {
   if (m_glContext)
     m_glContext->SetColour(colour);
 {
   if (m_glContext)
     m_glContext->SetColour(colour);