use best size instead of hard coded 80*26 in SetSize(wxSIZE_AUTO)

[wxWidgets.git] / src / common / containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 6262adfd24d32931216fa0e418711ea18fe5eaf8..368cee065daaa97b9e30e7b3d0d67dc2c2b8baac 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "containr.h"
 #endif
 
     #pragma implementation "containr.h"
 #endif
 


@@ -36,6 +36,10 @@
 
 #include "wx/containr.h"
 
 
 #include "wx/containr.h"
 

+#ifdef __WXMAC__
+    #include "wx/scrolbar.h"
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -57,10 +61,16 @@ bool wxControlContainer::AcceptsFocus() const
         // otherwise we can accept focus either if we have no children at all
         // (in this case we're probably not used as a container) or only when
         // at least one child will accept focus
         // otherwise we can accept focus either if we have no children at all
         // (in this case we're probably not used as a container) or only when
         // at least one child will accept focus

-        wxWindowList::Node *node = m_winParent->GetChildren().GetFirst();
+        wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst();

         if ( !node )
             return TRUE;
 
         if ( !node )
             return TRUE;
 

+#ifdef __WXMAC__
+        // wxMac has eventually the two scrollbars as children, they don't count
+        // as real children in the algorithm mentioned above
+        bool hasRealChildren = false ;
+#endif
+        

         while ( node )
         {
             wxWindow *child = node->GetData();
         while ( node )
         {
             wxWindow *child = node->GetData();


@@ -70,8 +80,18 @@ bool wxControlContainer::AcceptsFocus() const
                 return TRUE;
             }
 
                 return TRUE;
             }
 

+#ifdef __WXMAC__
+            wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ;
+            if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) )
+                hasRealChildren = true ;
+#endif

             node = node->GetNext();
         }
             node = node->GetNext();
         }

+        
+#ifdef __WXMAC__
+        if ( !hasRealChildren )
+            return TRUE ;
+#endif

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -165,7 +185,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
 
     // the node of the children list from which we should start looking for the
     // next acceptable child
 
     // the node of the children list from which we should start looking for the
     // next acceptable child

-    wxWindowList::Node *node, *start_node;
+    wxWindowList::compatibility_iterator node, start_node;

 
     // we should start from the first/last control and not from the one which
     // had focus the last time if we're propagating the event downwards because
 
     // we should start from the first/last control and not from the one which
     // had focus the last time if we're propagating the event downwards because


@@ -180,7 +200,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
         node = forward ? children.GetFirst() : children.GetLast();
 
         // we want to cycle over all nodes
         node = forward ? children.GetFirst() : children.GetLast();
 
         // we want to cycle over all nodes

-        start_node = (wxWindowList::Node *)NULL;
+        start_node = wxWindowList::compatibility_iterator();

     }
     else
     {
     }
     else
     {


@@ -204,7 +224,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
         }
         else
         {
         }
         else
         {

-            start_node = (wxWindowList::Node *)NULL;
+            start_node = wxWindowList::compatibility_iterator();

         }
 
         if ( !start_node && m_winLastFocused )
         }
 
         if ( !start_node && m_winLastFocused )


@@ -273,6 +293,9 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
             // and instead give it to the first/last child depending from which
             // direction we're coming
             event.SetEventObject(m_winParent);
             // and instead give it to the first/last child depending from which
             // direction we're coming
             event.SetEventObject(m_winParent);

+            // disable propagation for this call as otherwise the event might
+            // bounce back to us.
+            wxPropagationDisabler disableProp(event);

             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // set it first in case SetFocusFromKbd() results in focus
             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // set it first in case SetFocusFromKbd() results in focus


@@ -393,7 +416,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
     }
 
     // set the focus to the first child who wants it
     }
 
     // set the focus to the first child who wants it

-    wxWindowList::Node *node = win->GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();

     while ( node )
     {
         wxWindow *child = node->GetData();
     while ( node )
     {
         wxWindow *child = node->GetData();