isosurf corrections

#ifdeffed tab code in wxPanel


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-02-10 17:15:19 +00:00
parent cdb664d45d
commit 5e1962f77f
3 changed files with 6 additions and 9 deletions

View File

@@ -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 // 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 // panel is inside another panel, so make focus go to the next/prev
// control in the parent (if we have one) // 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() node = event.GetDirection() ? GetChildren().First()
: GetChildren().Last(); : GetChildren().Last();

View File

@@ -22,8 +22,8 @@ isosurf: isosurf.o glcanvas.o
isosurf.o: isosurf.cpp isosurf.o: isosurf.cpp
$(CC) `wx-config --cflags` -I../../gtk -c 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 $(CC) `wx-config --cflags` `gtk-config --cflags` -I../../gtk -c ../../gtk/glcanvas.cpp
clean: clean:
rm -f *.o cube rm -f *.o isosurf

View File

@@ -254,11 +254,7 @@ bool MyApp::OnInit(void)
GLX_DOUBLEBUFFER, None }; GLX_DOUBLEBUFFER, None };
#endif #endif
if(!doubleBuffer if(!doubleBuffer)
#ifdef __WXGTK__ // JACS
|| !wxGLCanvas::HaveVisual(gl_attrib)
#endif
)
{ {
printf("don't have double buffer, disabling\n"); printf("don't have double buffer, disabling\n");
#ifdef __WXGTK__ #ifdef __WXGTK__