Merge in from trunk r64802 - r68625

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

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index acc31346dd9f7366e7bab730f861c357581f291d..3fd27b8691ae0bd38d78a29fdbe65549571a87f2 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -61,7 +61,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
                         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;
@@ -84,7 +84,7 @@ Window wxGLCanvas::GetXWindow() const
 
 int wxGLCanvas::GetColourIndex(const wxColour& col_)
 {
-    wxColour& col = wx_const_cast(wxColour&, col_);
+    wxColour& col = const_cast<wxColour&>(col_);
 
 #ifdef __WXMOTIF__
     col.AllocColour(GetXDisplay());