Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

focus handling streamlined

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-25 10:24:51 +00:00
parent 43c5b6e808
commit f06e0fea67
5 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osx/window_osx.cpp
View File

@@ -200,10 +200,6 @@ WXWidget wxWindowMac::GetHandle() const
return NULL;
}
//
// TODO END move to window_osx.cpp
//
// ---------------------------------------------------------------------------
// Utility Routines to move between different coordinate systems
// ---------------------------------------------------------------------------
@@ -1515,16 +1511,9 @@ void wxWindowMac::MacOnScroll( wxScrollEvent &event )
}
}
// Get the window with the focus
wxWindow *wxWindowBase::DoFindFocus()
{
#if wxOSX_USE_CARBON
ControlRef control ;
GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
return wxFindWindowFromWXWidget( (WXWidget) control ) ;
#else
return NULL;
#endif
return wxFindWindowFromWXWidget(wxWidgetImpl::FindFocus());
}
void wxWindowMac::OnInternalIdle()
@@ -2006,7 +1995,10 @@ void wxWindowMac::MacRepositionScrollBars()
bool wxWindowMac::AcceptsFocus() const
{
return m_peer->CanFocus() && wxWindowBase::AcceptsFocus();
if ( MacIsUserPane() )
return wxWindowBase::AcceptsFocus();
else
return m_peer->CanFocus();
}
void wxWindowMac::MacSuperChangedPosition()