Use gdk_window_invalidate instead of gtk_widget_queue_draw as the latter doesn't...

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 8f41d782f2f2848311b3a96ae062f70f900d9558..b79bf180b1ca521cba37d557744ac7b5941d6ea8 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -398,7 +398,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
     {
         // just to be sure it's not used (normally this is not necessary, but
         // doesn't hurt neither)
     {
         // just to be sure it's not used (normally this is not necessary, but
         // doesn't hurt neither)

-        m_winLastFocused = (wxWindow *)NULL;
+        m_winLastFocused = NULL;

 
         // start from first or last depending on where we're going
         node = forward ? children.GetFirst() : children.GetLast();
 
         // start from first or last depending on where we're going
         node = forward ? children.GetFirst() : children.GetLast();


@@ -533,7 +533,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
                   !m_winLastFocused->HasFlag(wxRB_SINGLE) )
         {
             wxRadioButton * const
                   !m_winLastFocused->HasFlag(wxRB_SINGLE) )
         {
             wxRadioButton * const

-                lastBtn = wx_static_cast(wxRadioButton *, m_winLastFocused);
+                lastBtn = static_cast<wxRadioButton *>(m_winLastFocused);

 
             // cursor keys don't navigate out of a radio button group so
             // find the correct radio button to focus
 
             // cursor keys don't navigate out of a radio button group so
             // find the correct radio button to focus


@@ -566,7 +566,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
         }
 #endif // __WXMSW__
 
         }
 #endif // __WXMSW__
 

-        if ( child->CanAcceptFocus() )
+        if ( child->CanAcceptFocusFromKeyboard() )

         {
             // if we're setting the focus to a child panel we should prevent it
             // from giving it to the child which had the focus the last time
         {
             // if we're setting the focus to a child panel we should prevent it
             // from giving it to the child which had the focus the last time


@@ -662,7 +662,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
         else
         {
             // it doesn't count as such any more
         else
         {
             // it doesn't count as such any more

-            *childLastFocused = (wxWindow *)NULL;
+            *childLastFocused = NULL;

         }
     }
 
         }
     }