revert my last change

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

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 1354afb71072a17f0bb6acfe56acdf98216513b7..3736c7e91e5877d9899b57214a1d87f413e37232 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -18,9 +18,12 @@
 
 #if wxUSE_GLCANVAS
 
 
 #if wxUSE_GLCANVAS
 

+// #error Sorry, wxGLCanvas does not work yet with wxX11
+

 #include "wx/glcanvas.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/glcanvas.h"
 #include "wx/utils.h"
 #include "wx/app.h"

+#include "wx/log.h"

 
 #ifdef __VMS
 # pragma message disable nosimpint
 
 #ifdef __VMS
 # pragma message disable nosimpint


@@ -108,7 +111,7 @@ void wxGLContext::SwapBuffers()
     if (m_glContext)
     {
         Display* display = (Display*) wxGetDisplay();
     if (m_glContext)
     {
         Display* display = (Display*) wxGetDisplay();

-        glXSwapBuffers(display, (Window) m_window->GetClientWindow());
+        glXSwapBuffers(display, (Window) m_window->GetClientAreaWindow());

     }
 }
 
     }
 }
 


@@ -117,7 +120,7 @@ void wxGLContext::SetCurrent()
     if (m_glContext) 
     { 
         Display* display = (Display*) wxGetDisplay();
     if (m_glContext) 
     { 
         Display* display = (Display*) wxGetDisplay();

-        glXMakeCurrent(display, (Window) m_window->GetClientWindow(), 
+        glXMakeCurrent(display, (Window) m_window->GetClientAreaWindow(), 

                        m_glContext );;
     }
 }
                        m_glContext );;
     }
 }


@@ -237,8 +240,8 @@ bool wxGLCanvas::Create( wxWindow *parent,
 
     // Check for the presence of the GLX extension
     if(!glXQueryExtension(display, NULL, NULL)) {
 
     // 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) {
     }
 
     if(attribList) {


@@ -286,7 +289,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
       attribList = (int*) data;
       // Get an appropriate visual
       vi = glXChooseVisual(display, DefaultScreen(display), attribList);
       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,
       
       // Here we should make sure that vi is the same visual as the
       // one used by the xwindow drawable in wxCanvas.  However,


@@ -294,12 +297,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 ?
     } else {
        // By default, we use the visual of xwindow
         // NI: is this really senseful ? opengl in e.g. color index mode ?

-       XGetWindowAttributes(display, (Window) GetClientWindow(), &xwa);
+       XGetWindowAttributes(display, (Window) GetClientAreaWindow(), &xwa);

        vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
        vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
        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);
        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.
        // 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 +329,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
        a_list[n] = None;
        // XFree(vi);
        vi = glXChooseVisual(display, DefaultScreen(display), a_list);
        a_list[n] = None;
        // XFree(vi);
        vi = glXChooseVisual(display, DefaultScreen(display), a_list);

-       if(!vi) return false;
+       if(!vi) return FALSE;

 #endif /* OLD_MESA */
     }
 
 #endif /* OLD_MESA */
     }
 


@@ -347,7 +350,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 #endif
     SetCurrent();
 
 #endif
     SetCurrent();
 

-    return true;
+    return TRUE;

 }
 
 wxGLCanvas::~wxGLCanvas(void)
 }
 
 wxGLCanvas::~wxGLCanvas(void)


@@ -366,7 +369,7 @@ void wxGLCanvas::SwapBuffers()
     if( m_glContext ) m_glContext->SwapBuffers();
 
     // Display* display = (Display*) GetXDisplay();
     if( m_glContext ) m_glContext->SwapBuffers();
 
     // Display* display = (Display*) GetXDisplay();

-    // if(glx_cx) glXSwapBuffers(display, (Window) GetClientWindow());
+    // if(glx_cx) glXSwapBuffers(display, (Window) GetClientAreaWindow());

 }
 
 void wxGLCanvas::SetCurrent()
 }
 
 void wxGLCanvas::SetCurrent()


@@ -374,7 +377,7 @@ void wxGLCanvas::SetCurrent()
     if( m_glContext ) m_glContext->SetCurrent();
 
     // Display* display = (Display*) GetXDisplay();
     if( m_glContext ) m_glContext->SetCurrent();
 
     // Display* display = (Display*) GetXDisplay();

-    // if(glx_cx) glXMakeCurrent(display, (Window) GetClientWindow(), glx_cx);
+    // if(glx_cx) glXMakeCurrent(display, (Window) GetClientAreaWindow(), glx_cx);

 }
 
 void wxGLCanvas::SetColour(const char *col)
 }
 
 void wxGLCanvas::SetColour(const char *col)