restored "#ifdef __WXMSW__" around SetFont(wxNullFont) - this leads to SIGSEGV

[wxWidgets.git] / src / generic / panelg.cpp

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 05bd8acb9d9a8eac79905d1eed5ff628f54f2c3f..c58841ba5c0f1e91058699e185114bdf158837d1 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -93,7 +93,7 @@ void wxPanel::OnNavigationKey(wxNavigationKeyEvent& event)
   wxWindow *winFocus = event.GetCurrentFocus();
   
   // @@@ no FindFocus() in wxGTK
   wxWindow *winFocus = event.GetCurrentFocus();
   
   // @@@ no FindFocus() in wxGTK

-  #ifndef __GTK__
+  #ifndef __WXGTK__

     if ( winFocus == NULL )
       winFocus = wxWindow::FindFocus();
   #endif
     if ( winFocus == NULL )
       winFocus = wxWindow::FindFocus();
   #endif


@@ -112,9 +112,6 @@ void wxPanel::OnNavigationKey(wxNavigationKeyEvent& event)
 // set focus to the next child which accepts it (or first/last if node == NULL)
 bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward)
 {
 // set focus to the next child which accepts it (or first/last if node == NULL)
 bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward)
 {

-       // Added by JACS since this seems to cause an infinite loop.
-       return FALSE;
-

   // @@ using typed list would be better...
   #define WIN(node) ((wxWindow *)(node->Data()))
 
   // @@ using typed list would be better...
   #define WIN(node) ((wxWindow *)(node->Data()))
 


@@ -131,15 +128,24 @@ bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward)
 
     bFound = WIN(node)->AcceptsFocus();
   }
 
     bFound = WIN(node)->AcceptsFocus();
   }

+#if 0 // to restore when it will really work (now it's triggered all the time)

   else {
     // just to be sure it's the right one
     wxASSERT( WIN(node)->AcceptsFocus() );
   }
   else {
     // just to be sure it's the right one
     wxASSERT( WIN(node)->AcceptsFocus() );
   }

+#endif // 0

 
   // find the next child which accepts focus
 
   // find the next child which accepts focus

+  bool bParentWantsIt = TRUE;

   while ( !bFound ) {
     node = bForward ? node->Next() : node->Previous();
     if ( node == NULL ) {
   while ( !bFound ) {
     node = bForward ? node->Next() : node->Previous();
     if ( node == NULL ) {

+      if ( !bParentWantsIt ) {
+        // we've already been here which means that we've done a whole
+        // cycle without success - get out from the infinite loop
+        return FALSE;
+      }
+

       // ask parent if he doesn't want to advance focus to the next panel
       if ( GetParent() != NULL ) {
         wxNavigationKeyEvent event;
       // ask parent if he doesn't want to advance focus to the next panel
       if ( GetParent() != NULL ) {
         wxNavigationKeyEvent event;


@@ -151,6 +157,9 @@ bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward)
           return TRUE;
       }
 
           return TRUE;
       }
 

+      // a sentinel to avoid infinite loops
+      bParentWantsIt = FALSE;
+

       // wrap around
       node = bForward ? children->First() : children->Last();
     }
       // wrap around
       node = bForward ? children->First() : children->Last();
     }