use correct scale when drawing

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index ecc7570e708ac2886a6183a6188ad59d2ec94c3a..9de060cddaff1e454cc345cef2395d4343bb9cf4 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -54,7 +54,10 @@ bool wxControlContainerBase::UpdateCanFocusChildren()
     {
         m_acceptsFocusChildren = acceptsFocusChildren;
 
     {
         m_acceptsFocusChildren = acceptsFocusChildren;
 

-        m_winParent->SetCanFocus(AcceptsFocusRecursively());
+        // In the ports where it does something non trivial, the parent window
+        // should only be focusable if it doesn't have any focusable children
+        // (e.g. native focus handling in wxGTK totally breaks down otherwise).
+        m_winParent->SetCanFocus(m_acceptsFocusSelf && !m_acceptsFocusChildren);

     }
 
     return m_acceptsFocusChildren;
     }
 
     return m_acceptsFocusChildren;


@@ -184,7 +187,7 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
 // within the same group. Used by wxSetFocusToChild on wxMSW
 // --------------------------------------------------------------------
 
 // within the same group. Used by wxSetFocusToChild on wxMSW
 // --------------------------------------------------------------------
 

-#if defined(__WXMSW__) && wxUSE_RADIOBTN
+#if wxUSE_RADIOBTN 

 
 wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn)
 {
 
 wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn)
 {