Use a " " (space) for the menu item if an empty string is used for an item in a wxCho...

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

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 2525acf3e9dc516107f54a472852119462aa4f91..1d6963ddd67a36799f458611c1bdb1e75efdfc93 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -203,9 +203,12 @@ bool wxGLCanvas::Create(wxWindow *parent,
                         long style,
                         const wxString& name,
                         const int *attribList,
-                        const wxPalette& WXUNUSED_UNLESS_DEBUG(palette))
+                        const wxPalette& palette)
 {
+#if wxUSE_PALETTE
     wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
+#endif // wxUSE_PALETTE
+    wxUnusedVar(palette); // Unused when wxDEBUG_LEVEL==0
 
     m_exposed = false;
     m_noExpose = true;
@@ -247,7 +250,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
 
 Window wxGLCanvas::GetXWindow() const
 {
-    GdkWindow *window = m_wxwindow->window;
+    GdkWindow* window = GTKGetDrawingWindow();
     return window ? GDK_WINDOW_XWINDOW(window) : 0;
 }