scope added for keyboard handler

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

diff --git a/src/motif/glcanvas.cpp b/src/motif/glcanvas.cpp
index 046c5d0c6c92cfd76cd71eeaa8c306c74f33d5b6..65f2f0526cac2f9f201b4281d3deb09714088e99 100644 (file)
--- a/src/motif/glcanvas.cpp
+++ b/src/motif/glcanvas.cpp
@@ -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
 


@@ -21,10 +21,21 @@
 #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
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS
+# pragma message enable nosimpint
+#endif

 #include "wx/motif/private.h"
 
 #include "wx/motif/private.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 #ifdef OLD_MESA
 // workaround for bug in Mesa's glx.c
 static int bitcount( unsigned long n )
 #ifdef OLD_MESA
 // workaround for bug in Mesa's glx.c
 static int bitcount( unsigned long n )


@@ -137,7 +148,7 @@ void wxGLContext::SetColour(const char *colour)
                if(!XAllocColor((Display*) m_window->GetXDisplay(),
                   (Colormap) wxTheApp->GetMainColormap(m_window->GetXDisplay()),
                   &exact_def)) {
                if(!XAllocColor((Display*) m_window->GetXDisplay(),
                   (Colormap) wxTheApp->GetMainColormap(m_window->GetXDisplay()),
                   &exact_def)) {

-                   wxDebugMsg("wxGLCanvas: cannot allocate color\n");
+                   wxLogError("wxGLCanvas: cannot allocate color\n");

                    return;
                }
                pix = the_colour->m_pixel = exact_def.pixel;
                    return;
                }
                pix = the_colour->m_pixel = exact_def.pixel;


@@ -239,7 +250,7 @@ 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");
+       wxLogError("wxGLCanvas: GLX extension is missing\n");

        return false;
     }
 
        return false;
     }