From 5e1962f77f7243f000a2c63c0adcf94d3876bf18 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Wed, 10 Feb 1999 17:15:19 +0000
Subject: [PATCH]   isosurf corrections   #ifdeffed tab code in wxPanel

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/panelg.cpp                     | 5 +++--
 utils/glcanvas/samples/isosurf/Makefile    | 4 ++--
 utils/glcanvas/samples/isosurf/isosurf.cpp | 6 +-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 9f3813167a..8c25ac1570 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -120,7 +120,8 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
     {
         if (!node)
         {
-//#if 0 // FIXME seems to enter in an infinite loop - how is this possible?
+#ifndef __WXGTK__
+     // FIXME seems to enter in an infinite loop - how is this possible?
             // we arrived at the last/first of our children - but may be this
             // panel is inside another panel, so make focus go to the next/prev
             // control in the parent (if we have one)
@@ -136,7 +137,7 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
                     return;
                 }
             }
-//#endif // 0
+#endif
 
             node = event.GetDirection() ? GetChildren().First()
                                         : GetChildren().Last();
diff --git a/utils/glcanvas/samples/isosurf/Makefile b/utils/glcanvas/samples/isosurf/Makefile
index e004da7555..ca096666db 100644
--- a/utils/glcanvas/samples/isosurf/Makefile
+++ b/utils/glcanvas/samples/isosurf/Makefile
@@ -22,8 +22,8 @@ isosurf: isosurf.o glcanvas.o
 isosurf.o: isosurf.cpp
 	$(CC) `wx-config --cflags` -I../../gtk -c isosurf.cpp
 
-glcanvas.o: ../..gtk/glcanvas.cpp
+glcanvas.o: ../../gtk/glcanvas.cpp
 	$(CC) `wx-config --cflags` `gtk-config --cflags` -I../../gtk -c ../../gtk/glcanvas.cpp
 
 clean: 
-	rm -f *.o cube
+	rm -f *.o isosurf
diff --git a/utils/glcanvas/samples/isosurf/isosurf.cpp b/utils/glcanvas/samples/isosurf/isosurf.cpp
index 3d9d966655..7f298d3f82 100644
--- a/utils/glcanvas/samples/isosurf/isosurf.cpp
+++ b/utils/glcanvas/samples/isosurf/isosurf.cpp
@@ -254,11 +254,7 @@ bool MyApp::OnInit(void)
 			GLX_DOUBLEBUFFER, None };
 #endif
 
-  if(!doubleBuffer
-#ifdef __WXGTK__ // JACS
-   || !wxGLCanvas::HaveVisual(gl_attrib)
-#endif
-   )
+  if(!doubleBuffer)
    {
       printf("don't have double buffer, disabling\n");
 #ifdef __WXGTK__
-- 
2.45.2