disable wxGLCanvas for wxMGL and wxDFB which don't support it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 2bef6d2a7d18383e36234e265f333b330ac3a8e3..c98c6d43cb70ab3e1664349d8acba77867300348 100755 (executable)
--- a/configure
+++ b/configure
@@ -32821,7 +32821,11 @@ fi
 
 USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes"; then
 
 USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes"; then

-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then
+        { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
+echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
+        wxUSE_OPENGL="no"
+    elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then

         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"

diff --git a/configure.in b/configure.in
index c54e99f61a45249e6802c9d325eddbce9d1c6ae6..c77622c3e710c9e290cf0e9767744343c3bfefb0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3901,7 +3901,10 @@ dnl ---------------------------------------------------------------------------
 
 USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes"; then
 
 USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes"; then

-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then
+        AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
+        wxUSE_OPENGL="no"
+    elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then

         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 751cd4f2e5d1ed39355adfacc9abf71612280d19..680796ee28fbabc26e6d66d9274659d782b385d0 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -60,6 +60,8 @@ enum
 #include "wx/mac/glcanvas.h"
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/glcanvas.h"
 #include "wx/mac/glcanvas.h"
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/glcanvas.h"

+#else
+#error "wxGLCanvas not supported in this wxWidgets port"

 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"