rtti api mods added

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

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 2af81c1626fbdd09142e42c8526e24387a0a0069..9fc512eb43bd91b508c2523970758772f8466a1b 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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:
 //              Uses the GLX extension.
 // Author:      Julian Smart and Wolfram Gloger
 // Modified by:


@@ -10,7 +10,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "glcanvas.h"
 #endif
 
 #pragma implementation "glcanvas.h"
 #endif
 


@@ -18,8 +18,6 @@
 
 #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"


@@ -28,11 +26,24 @@
 #ifdef __VMS
 # pragma message disable nosimpint
 #endif
 #ifdef __VMS
 # pragma message disable nosimpint
 #endif

-#include <Xm/Xm.h>
+#include <X11/Xlib.h>

 #ifdef __VMS
 # pragma message enable nosimpint
 #endif
 #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
 
 #ifdef OLD_MESA
 // workaround for bug in Mesa's glx.c


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

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

     }
 }
 
     }
 }
 


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

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

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


@@ -136,7 +147,11 @@ void wxGLContext::SetColour(const char *colour)
                       the_colour->Green(),
                       the_colour->Blue());
        } else {
                       the_colour->Green(),
                       the_colour->Blue());
        } else {

+#ifdef __WXMOTIF__
+            the_colour->AllocColour(m_window->GetXDisplay());
+#else

             the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
             the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));

+#endif

            GLint pix = (GLint)the_colour->GetPixel();
            if(pix == -1)
             {
            GLint pix = (GLint)the_colour->GetPixel();
            if(pix == -1)
             {


@@ -297,7 +312,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 ?
     } 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;
        vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
        vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
        if(!vi) return FALSE;