UMADrawControl is not to be used anymore

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

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 3736c7e91e5877d9899b57214a1d87f413e37232..0059ab89cf9b459ac510fc17d6c1f947c574515e 100644 (file)
--- 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:
@@ -10,7 +10,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "glcanvas.h"
 #endif
 
@@ -18,8 +18,6 @@
 
 #if wxUSE_GLCANVAS
 
-// #error Sorry, wxGLCanvas does not work yet with wxX11
-
 #include "wx/glcanvas.h"
 #include "wx/utils.h"
 #include "wx/app.h"
@@ -28,11 +26,24 @@
 #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
@@ -62,12 +73,12 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win,
     wxGLCanvas *gc = (wxGLCanvas*) win;
     XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
     
-    wxCHECK_RET( vi, "invalid visual for OpenGl" );
+    wxCHECK_RET( vi, wxT("invalid visual for OpenGL") );
     
     m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi,
                                     None, GL_TRUE);
   
-    wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+    wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGL context") );
 }
 
 wxGLContext::wxGLContext( 
@@ -82,7 +93,7 @@ wxGLContext::wxGLContext(
     wxGLCanvas *gc = (wxGLCanvas*) win;
     XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
     
-    wxCHECK_RET( vi, "invalid visual for OpenGl" );
+    wxCHECK_RET( vi, wxT("invalid visual for OpenGL") );
     
     if( other != 0 )
         m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, 
@@ -91,7 +102,7 @@ wxGLContext::wxGLContext(
         m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi,
                                         None, GL_TRUE );
     
-    wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+    wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGL context") );
 }
 
 wxGLContext::~wxGLContext()
@@ -111,7 +122,7 @@ void wxGLContext::SwapBuffers()
     if (m_glContext)
     {
         Display* display = (Display*) wxGetDisplay();
-        glXSwapBuffers(display, (Window) m_window->GetClientAreaWindow());
+        glXSwapBuffers(display, (Window) wxGetClientAreaWindow(m_window));
     }
 }
 
@@ -120,31 +131,39 @@ void wxGLContext::SetCurrent()
     if (m_glContext) 
     { 
         Display* display = (Display*) wxGetDisplay();
-        glXMakeCurrent(display, (Window) m_window->GetClientAreaWindow(), 
+        glXMakeCurrent(display, (Window) wxGetClientAreaWindow(m_window), 
                        m_glContext );;
     }
 }
 
-void wxGLContext::SetColour(const char *colour)
+void wxGLContext::SetColour(const wxChar *colour)
 {
-    wxColour *the_colour = wxTheColourDatabase->FindColour(colour);
-    if(the_colour) {
-       GLboolean b;
-       glGetBooleanv(GL_RGBA_MODE, &b);
-       if(b) {
-           glColor3ub(the_colour->Red(),
-                      the_colour->Green(),
-                      the_colour->Blue());
-       } else {
-            the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
-           GLint pix = (GLint)the_colour->GetPixel();
-           if(pix == -1)
+    wxColour the_colour = wxTheColourDatabase->Find(colour);
+    if(the_colour.Ok())
+    {
+        GLboolean b;
+        glGetBooleanv(GL_RGBA_MODE, &b);
+        if(b)
+        {
+            glColor3ub(the_colour.Red(),
+                    the_colour.Green(),
+                    the_colour.Blue());
+        }
+        else
+        {
+#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)
             {
-                wxLogError("wxGLCanvas: cannot allocate color\n");
-               return;
+                wxLogError(wxT("wxGLCanvas: cannot allocate color\n"));
+                return;
             }
-           glIndexi(pix);
-       }
+            glIndexi(pix);
+        }
     }
 }
 
@@ -240,7 +259,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 
     // Check for the presence of the GLX extension
     if(!glXQueryExtension(display, NULL, NULL)) {
-       wxLogDebug("wxGLCanvas: GLX extension is missing\n");
+       wxLogDebug(wxT("wxGLCanvas: GLX extension is missing\n"));
        return FALSE;
     }
 
@@ -297,7 +316,7 @@ 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) GetClientAreaWindow(), &xwa);
+       XGetWindowAttributes(display, (Window)wxGetClientAreaWindow(this), &xwa);
        vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
        vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
        if(!vi) return FALSE;
@@ -335,7 +354,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 
     m_vi = vi;  // safe for later use
     
-    wxCHECK_MSG( m_vi, FALSE, "required visual couldn't be found" );
+    wxCHECK_MSG( m_vi, FALSE, wxT("required visual couldn't be found") );
 
     // Create the GLX context and make it current
 
@@ -380,7 +399,7 @@ void wxGLCanvas::SetCurrent()
     // if(glx_cx) glXMakeCurrent(display, (Window) GetClientAreaWindow(), glx_cx);
 }
 
-void wxGLCanvas::SetColour(const char *col)
+void wxGLCanvas::SetColour(const wxChar *col)
 {
     if( m_glContext ) m_glContext->SetColour(col);
 }