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

attempt for a different fix to focus rect refresh problems under full keyboard access

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@61280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-07-02 12:59:53 +00:00
parent 4680ad0e41
commit 114aa762de
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/textctrl.cpp
View File

@@ -433,7 +433,7 @@ void wxTextCtrl::CreatePeer(
// So for now, don't use wxMacLTEHIViewControl unless we really have to. // So for now, don't use wxMacLTEHIViewControl unless we really have to.
if ( (m_windowStyle & wxTE_MULTILINE) if ( (m_windowStyle & wxTE_MULTILINE)
#if 0 // wxMAC_USE_CORE_GRAPHICS #if 1 // wxMAC_USE_CORE_GRAPHICS
|| ( UMAGetSystemVersion() >= 0x1050 ) || ( UMAGetSystemVersion() >= 0x1050 )
#endif #endif
) )

33
src/mac/carbon/window.cpp
View File

@@ -92,8 +92,8 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
EVT_PAINT(wxWindowMac::OnPaint) EVT_PAINT(wxWindowMac::OnPaint)
#endif #endif
EVT_SET_FOCUS(wxWindowMac::OnSetFocus) // EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
EVT_KILL_FOCUS(wxWindowMac::OnSetFocus) // EVT_KILL_FOCUS(wxWindowMac::OnSetFocus)
EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -352,7 +352,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
thisWindow->GetCaret()->OnKillFocus(); thisWindow->GetCaret()->OnKillFocus();
#endif #endif
wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow)); wxLogTrace(_T("focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
// remove this as soon as posting the synthesized event works properly // remove this as soon as posting the synthesized event works properly
static bool inKillFocusEvent = false ; static bool inKillFocusEvent = false ;
@@ -363,6 +363,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId()); wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
event.SetEventObject(thisWindow); event.SetEventObject(thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(event) ; thisWindow->GetEventHandler()->ProcessEvent(event) ;
thisWindow->wxWindowMac::OnSetFocus(event);
inKillFocusEvent = false ; inKillFocusEvent = false ;
} }
} }
@@ -373,7 +374,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
{ {
// set focus // set focus
// panel wants to track the window which was the last to have focus in it // panel wants to track the window which was the last to have focus in it
wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow)); wxLogTrace(_T("focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
wxChildFocusEvent eventFocus((wxWindow*)thisWindow); wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(eventFocus); thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
@@ -385,6 +386,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId()); wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
event.SetEventObject(thisWindow); event.SetEventObject(thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(event) ; thisWindow->GetEventHandler()->ProcessEvent(event) ;
thisWindow->wxWindowMac::OnSetFocus(event);
} }
} }
} }
@@ -446,7 +448,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
thisWindow->GetCaret()->OnKillFocus(); thisWindow->GetCaret()->OnKillFocus();
#endif #endif
wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow)); wxLogTrace(_T("focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
static bool inKillFocusEvent = false ; static bool inKillFocusEvent = false ;
@@ -462,7 +464,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
else else
{ {
// panel wants to track the window which was the last to have focus in it // panel wants to track the window which was the last to have focus in it
wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow)); wxLogTrace(_T("focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
wxChildFocusEvent eventFocus((wxWindow*)thisWindow); wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(eventFocus); thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
@@ -1410,10 +1412,10 @@ void wxWindowMac::SetFocus()
// as we cannot rely on the control features to find out whether we are in full keyboard mode, // as we cannot rely on the control features to find out whether we are in full keyboard mode,
// we can only leave in case of an error // we can only leave in case of an error
wxLogTrace(_T("Focus"), _T("SetFocus(%p)"), wx_static_cast(void*, this)); wxLogTrace(_T("focus"), _T("SetFocus(%p)"), wx_static_cast(void*, this));
OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ; OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
wxLogTrace(_T("Focus"), _T("m_peer->SetFocus received %d"), err); wxLogTrace(_T("focus"), _T("m_peer->SetFocus received %d"), err);
if ( err == errCouldntSetFocus ) if ( err == errCouldntSetFocus )
return ; return ;
@@ -2911,7 +2913,7 @@ wxWindow *wxWindowBase::DoFindFocus()
{ {
ControlRef control ; ControlRef control ;
GetKeyboardFocus( GetUserFocusWindow() , &control ) ; GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
wxLogTrace(_T("Focus"), _T("FindFocus(windowref=%p, peer =%p, wxwindow = %p)"), wxLogTrace(_T("focus"), _T("FindFocus(windowref=%p, peer =%p, wxwindow = %p)"),
wx_static_cast(void*, GetUserFocusWindow()), wx_static_cast(void*, control) wx_static_cast(void*, GetUserFocusWindow()), wx_static_cast(void*, control)
, wx_static_cast(void*, wxFindControlFromMacControl( control ))); , wx_static_cast(void*, wxFindControlFromMacControl( control )));
return (wxWindow*)wxFindControlFromMacControl( control ) ; return (wxWindow*)wxFindControlFromMacControl( control ) ;
@@ -2919,17 +2921,6 @@ wxWindow *wxWindowBase::DoFindFocus()
void wxWindowMac::OnSetFocus( wxFocusEvent& event ) void wxWindowMac::OnSetFocus( wxFocusEvent& event )
{ {
// panel wants to track the window which was the last to have focus in it,
// so we want to set ourselves as the window which last had focus
//
// notice that it's also important to do it upwards the tree because
// otherwise when the top level panel gets focus, it won't set it back to
// us, but to some other sibling
// CS: don't know if this is still needed:
//wxChildFocusEvent eventFocus(this);
//(void)GetEventHandler()->ProcessEvent(eventFocus);
if ( m_peer != NULL && MacGetTopLevelWindow() && m_peer->NeedsFocusRect() ) if ( m_peer != NULL && MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
{ {
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
@@ -2964,8 +2955,6 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
} }
#endif #endif
} }
event.Skip();
} }
void wxWindowMac::OnInternalIdle() void wxWindowMac::OnInternalIdle()