diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-08-20 21:15:27 -0500 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-09-14 07:03:28 +0000 |
| commit | 9684b9b6e5cb1354522af51e7ea75a49c44e638f (patch) | |
| tree | 63c3ea008d5db3127a193bf6138ecf0373d2d5ae /vcl/source | |
| parent | gridfixes: #i117625# recognize unsuccessful sorting attempts (diff) | |
| download | core-9684b9b6e5cb1354522af51e7ea75a49c44e638f.tar.gz core-9684b9b6e5cb1354522af51e7ea75a49c44e638f.zip | |
gridfixes: #i117265# implement less-predicate for Date/Time structs
Change-Id: Idf0e5bed399fbf288534779665198e214631c0a0
Reviewed-on: https://gerrit.libreoffice.org/536
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/control/ctrl.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 5039c2b83e15..b0e796d3ba37 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -47,7 +47,7 @@ using namespace vcl; void Control::ImplInitControlData() { - mbHasFocus = sal_False; + mbHasControlFocus = sal_False; mpControlData = new ImplControlData; } @@ -295,9 +295,10 @@ long Control::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) { - if ( !mbHasFocus ) + if ( !mbHasControlFocus ) { - mbHasFocus = sal_True; + mbHasControlFocus = sal_True; + StateChanged( STATE_CHANGE_CONTROL_FOCUS ); if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_GETFOCUS, maGetFocusHdl, this ) ) // been destroyed within the handler return sal_True; @@ -310,7 +311,8 @@ long Control::Notify( NotifyEvent& rNEvt ) Window* pFocusWin = Application::GetFocusWindow(); if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) ) { - mbHasFocus = sal_False; + mbHasControlFocus = sal_False; + StateChanged( STATE_CHANGE_CONTROL_FOCUS ); if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) ) // been destroyed within the handler return sal_True; |