isosurf corrections

  #ifdeffed tab code in wxPanel

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 9f3813167a9384ab4d304dc44c9a79aea89d98a4..8c25ac15707394c791c202f34d0f01a191d8e13c 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -120,7 +120,8 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
     {
         if (!node)
         {
     {
         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)
             // 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;
                 }
             }
                     return;
                 }
             }

-//#endif // 0
+#endif

 
             node = event.GetDirection() ? GetChildren().First()
                                         : GetChildren().Last();
 
             node = event.GetDirection() ? GetChildren().First()
                                         : GetChildren().Last();

diff --git a/utils/glcanvas/samples/isosurf/Makefile b/utils/glcanvas/samples/isosurf/Makefile
index e004da7555bfd9a60b54a24899ff43eb3f5c8bf2..ca096666db8bb2387d5e62915fe1bb9906090300 100644 (file)
--- 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
 
 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: 
        $(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 3d9d966655099c005793266f1cc2a21be4bbe6a6..7f298d3f824cbc7b1bf7a63ab2a33596c39d07eb 100644 (file)
--- 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
 
                        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__
    {
       printf("don't have double buffer, disabling\n");
 #ifdef __WXGTK__