X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/144ae5bbbf6c9cef6f5e6bb19f0f8bc7542a8810..3721dc6efe6f9ffe550c4c83bee2da210043bcaa:/src/gtk/glcanvas.cpp

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index ab444bc18c..89ffe1ba9f 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -157,6 +157,9 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        const wxPalette& palette)
     : m_createImplicitContext(true)
 {
+    m_sharedContext = NULL;
+    m_sharedContextOf = NULL;
+
     Create(parent, id, pos, size, style, name, attribList, palette);
 }
 
@@ -171,7 +174,7 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        const wxPalette& palette)
     : m_createImplicitContext(true)
 {
-    m_sharedContext = wx_const_cast(wxGLContext *, shared);
+    m_sharedContext = const_cast<wxGLContext *>(shared);
 
     Create(parent, id, pos, size, style, name, attribList, palette);
 }
@@ -185,7 +188,8 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        const wxPalette& palette )
     : m_createImplicitContext(true)
 {
-    m_sharedContextOf = wx_const_cast(wxGLCanvas *, shared);
+    m_sharedContext = NULL;
+    m_sharedContextOf = const_cast<wxGLCanvas *>(shared);
 
     Create(parent, id, pos, size, style, name, attribList, palette);
 }
@@ -201,7 +205,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
                         const int *attribList,
                         const wxPalette& WXUNUSED_UNLESS_DEBUG(palette))
 {
-    wxASSERT_MSG( !palette.IsOk(), _T("palettes not supported") );
+    wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
 
     m_exposed = false;
     m_noExpose = true;
@@ -243,7 +247,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;
 }