X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..4776c0b783a9776f94b049aecdc253d379686b6b:/src/gtk/glcanvas.cpp?ds=sidebyside diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index c8b805cc00..1d6963ddd6 100644 --- 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) { - wxASSERT_MSG( !palette.IsOk(), _T("palettes not supported") ); +#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; }