Upgrade bundled zlib to 1.2.8.

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

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index acc31346dd9f7366e7bab730f861c357581f291d..b6e7b5a6cf47acb05c1f2abcd979d9142eb3807f 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -5,7 +5,6 @@
 // Author:      Julian Smart and Wolfram Gloger
 // Modified by: Vadim Zeitlin to update to new API
 // Created:     1995, 1999
 // Author:      Julian Smart and Wolfram Gloger
 // Modified by: Vadim Zeitlin to update to new API
 // Created:     1995, 1999

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart, Wolfram Gloger
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart, Wolfram Gloger
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -61,7 +60,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
                         long style,
                         const wxString& name,
                         const int *attribList,
                         long style,
                         const wxString& name,
                         const int *attribList,

-                        const wxPalette& palette)
+                        const wxPalette& WXUNUSED(palette))

 {
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 {
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;


@@ -84,7 +83,7 @@ Window wxGLCanvas::GetXWindow() const
 
 int wxGLCanvas::GetColourIndex(const wxColour& col_)
 {
 
 int wxGLCanvas::GetColourIndex(const wxColour& col_)
 {

-    wxColour& col = wx_const_cast(wxColour&, col_);
+    wxColour& col = const_cast<wxColour&>(col_);

 
 #ifdef __WXMOTIF__
     col.AllocColour(GetXDisplay());
 
 #ifdef __WXMOTIF__
     col.AllocColour(GetXDisplay());