X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3baff1c85af02b058ba409ea86976e6c7a45fed..68a2e005a51a87df6cc445345f27443e57ab3608:/src/x11/glcanvas.cpp?ds=sidebyside

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index aadb88a6c0..fabb565b27 100644
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.cpp
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows 2.0 for Motif.
+// Purpose:     wxGLCanvas, for using OpenGL with wxWindows
 //              Uses the GLX extension.
 // Author:      Julian Smart and Wolfram Gloger
 // Modified by:
@@ -21,15 +21,29 @@
 #include "wx/glcanvas.h"
 #include "wx/utils.h"
 #include "wx/app.h"
+#include "wx/log.h"
 
 #ifdef __VMS
 # pragma message disable nosimpint
 #endif
-#include <Xm/Xm.h>
+#include <X11/Xlib.h>
 #ifdef __VMS
 # pragma message enable nosimpint
 #endif
-#include "wx/motif/private.h"
+#include "wx/x11/private.h"
+
+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+
+static inline WXWindow wxGetClientAreaWindow(wxWindow* win)
+{
+#ifdef __WXMOTIF__
+    return win->GetClientXWindow();
+#else
+    return win->GetClientAreaWindow();
+#endif
+}
 
 #ifdef OLD_MESA
 // workaround for bug in Mesa's glx.c
@@ -61,7 +75,7 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win,
     
     wxCHECK_RET( vi, "invalid visual for OpenGl" );
     
-    m_glContext = glXCreateContext( (Display *)m_window->GetXDisplay(), vi,
+    m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi,
                                     None, GL_TRUE);
   
     wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
@@ -82,10 +96,10 @@ wxGLContext::wxGLContext(
     wxCHECK_RET( vi, "invalid visual for OpenGl" );
     
     if( other != 0 )
-        m_glContext = glXCreateContext( (Display *)m_window->GetXDisplay(), vi, 
+        m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, 
                                         other->m_glContext, GL_TRUE );
     else
-        m_glContext = glXCreateContext( (Display *)m_window->GetXDisplay(), vi,
+        m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi,
                                         None, GL_TRUE );
     
     wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
@@ -97,18 +111,18 @@ wxGLContext::~wxGLContext()
     
     if (m_glContext == glXGetCurrentContext())
     {
-        glXMakeCurrent( (Display*) m_window->GetXDisplay(), None, NULL);
+        glXMakeCurrent( (Display*) wxGetDisplay(), None, NULL);
     }
 	
-    glXDestroyContext( (Display*) m_window->GetXDisplay(), m_glContext );
+    glXDestroyContext( (Display*) wxGetDisplay(), m_glContext );
 }
 
 void wxGLContext::SwapBuffers()
 {
     if (m_glContext)
     {
-        Display* display = (Display*) m_window->GetXDisplay();
-        glXSwapBuffers(display, (Window) m_window->GetXWindow());
+        Display* display = (Display*) wxGetDisplay();
+        glXSwapBuffers(display, (Window) wxGetClientAreaWindow(m_window));
     }
 }
 
@@ -116,8 +130,8 @@ void wxGLContext::SetCurrent()
 {
     if (m_glContext) 
     { 
-        Display* display = (Display*) m_window->GetXDisplay();
-        glXMakeCurrent(display, (Window) m_window->GetXWindow(), 
+        Display* display = (Display*) wxGetDisplay();
+        glXMakeCurrent(display, (Window) wxGetClientAreaWindow(m_window), 
                        m_glContext );;
     }
 }
@@ -133,7 +147,11 @@ void wxGLContext::SetColour(const char *colour)
 		       the_colour->Green(),
 		       the_colour->Blue());
 	} else {
-            the_colour->CalcPixel(wxTheApp->GetMainColormap(m_window->GetXDisplay()));
+#ifdef __WXMOTIF__
+            the_colour->AllocColour(m_window->GetXDisplay());
+#else
+            the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
+#endif
 	    GLint pix = (GLint)the_colour->GetPixel();
 	    if(pix == -1)
             {
@@ -233,12 +251,12 @@ bool wxGLCanvas::Create( wxWindow *parent,
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;
 
-    Display* display = (Display*) GetXDisplay();
+    Display* display = (Display*) wxGetDisplay();
 
     // Check for the presence of the GLX extension
     if(!glXQueryExtension(display, NULL, NULL)) {
-	wxDebugMsg("wxGLCanvas: GLX extension is missing\n");
-	return false;
+	wxLogDebug("wxGLCanvas: GLX extension is missing\n");
+	return FALSE;
     }
 
     if(attribList) {
@@ -286,7 +304,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
       attribList = (int*) data;
       // Get an appropriate visual
       vi = glXChooseVisual(display, DefaultScreen(display), attribList);
-      if(!vi) return false;
+      if(!vi) return FALSE;
       
       // Here we should make sure that vi is the same visual as the
       // one used by the xwindow drawable in wxCanvas.  However,
@@ -294,12 +312,12 @@ bool wxGLCanvas::Create( wxWindow *parent,
     } else {
 	// By default, we use the visual of xwindow
         // NI: is this really senseful ? opengl in e.g. color index mode ?
-	XGetWindowAttributes(display, (Window) GetXWindow(), &xwa);
+	XGetWindowAttributes(display, (Window)wxGetClientAreaWindow(this), &xwa);
 	vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
 	vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
-	if(!vi) return false;
+	if(!vi) return FALSE;
 	glXGetConfig(display, vi, GLX_USE_GL, &val);
-	if(!val) return false;
+	if(!val) return FALSE;
 	// Basically, this is it.  It should be possible to use vi
 	// in glXCreateContext() below.  But this fails with Mesa.
 	// I notified the Mesa author about it; there may be a fix.
@@ -326,7 +344,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 	a_list[n] = None;
 	// XFree(vi);
 	vi = glXChooseVisual(display, DefaultScreen(display), a_list);
-	if(!vi) return false;
+	if(!vi) return FALSE;
 #endif /* OLD_MESA */
     }
 
@@ -347,7 +365,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 #endif
     SetCurrent();
 
-    return true;
+    return TRUE;
 }
 
 wxGLCanvas::~wxGLCanvas(void)
@@ -366,7 +384,7 @@ void wxGLCanvas::SwapBuffers()
     if( m_glContext ) m_glContext->SwapBuffers();
 
     // Display* display = (Display*) GetXDisplay();
-    // if(glx_cx) glXSwapBuffers(display, (Window) GetXWindow());
+    // if(glx_cx) glXSwapBuffers(display, (Window) GetClientAreaWindow());
 }
 
 void wxGLCanvas::SetCurrent()
@@ -374,7 +392,7 @@ void wxGLCanvas::SetCurrent()
     if( m_glContext ) m_glContext->SetCurrent();
 
     // Display* display = (Display*) GetXDisplay();
-    // if(glx_cx) glXMakeCurrent(display, (Window) GetXWindow(), glx_cx);
+    // if(glx_cx) glXMakeCurrent(display, (Window) GetClientAreaWindow(), glx_cx);
 }
 
 void wxGLCanvas::SetColour(const char *col)