diff options
| -rw-r--r-- | views/controls/tabbed_pane/native_tabbed_pane_gtk.cc | 2 | ||||
| -rw-r--r-- | views/focus/focus_manager.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc index 0b47abde..02d5fe6 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc @@ -153,7 +153,7 @@ void NativeTabbedPaneGtk::DoAddTabAtIndex(int index, const std::wstring& title, WidgetGtk* page_container = new WidgetGtk(WidgetGtk::TYPE_CHILD); page_container->Init(NULL, gfx::Rect()); page_container->SetContentsView(contents); - page_container->SetFocusTraversableParent(GetRootView()); + page_container->SetFocusTraversableParent(GetWidget()->GetFocusTraversable()); page_container->SetFocusTraversableParentView(this); page_container->Show(); diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h index e58577a..46a867e 100644 --- a/views/focus/focus_manager.h +++ b/views/focus/focus_manager.h @@ -54,17 +54,17 @@ // the focus traversal traverse down the focus hierarchy to enter the nested // RootView. In the example mentioned above, the NativeControl overrides // GetFocusTraversable() and returns hwnd_view_container_->GetRootView(). -// - call RootView::SetFocusTraversableParent() on the nested RootView and point -// it to the outter RootView. This is used when the focus goes out of the +// - call Widget::SetFocusTraversableParent() on the nested RootView and point +// it to the outer RootView. This is used when the focus goes out of the // nested RootView. In the example: -// hwnd_view_container_->GetRootView()->SetFocusTraversableParent( +// hwnd_view_container_->GetWidget()->SetFocusTraversableParent( // native_control->GetRootView()); // - call RootView::SetFocusTraversableParentView() on the nested RootView with // the parent view that directly contains the native window. This is needed // when traversing up from the nested RootView to know which view to start // with when going to the next/previous view. // In our example: -// hwnd_view_container_->GetRootView()->SetFocusTraversableParent( +// hwnd_view_container_->GetWidget()->SetFocusTraversableParent( // native_control); // // Note that FocusTraversable do not have to be RootViews: AccessibleToolbarView |