diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 15:42:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 15:42:59 +0200 |
| commit | 71fefe1dc2bcda3a4cc18d71e1acaf161cc059f2 (patch) | |
| tree | 23052830d85c8ba9ad4862adf77aa31086573f93 /vcl/win/source/window | |
| parent | 52ae345470d8fa657817cf87b3e8e8c1b51bd7da (diff) | |
Change "blink times" to be of type sal_uInt64
...and thus consistent with Timer::Get/SetTimeout since
9c7016b5b530ca212b1275f44f9e2fc0527109ee "Scheduler: Changed uLong to
uInt32/uInt64." Otherwise, at least JunitTest_forms_unoapi on 32-bit Linux
would stay busy forever in vcl::Cursor::ImplTimerHdl, alternating among
ImplRestore() and ImplDraw().
Change-Id: Ic3fd349344c105078b52749ca85559fce485d0c4
Diffstat (limited to 'vcl/win/source/window')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 47a72052f417..e9da7341573d 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2657,7 +2657,10 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetScrollBarSize( GetSystemMetrics( SM_CXVSCROLL ) ); aStyleSettings.SetSpinSize( GetSystemMetrics( SM_CXVSCROLL ) ); - aStyleSettings.SetCursorBlinkTime( GetCaretBlinkTime() ); + UINT blinkTime = GetCaretBlinkTime(); + aStyleSettings.SetCursorBlinkTime( + blinkTime == 0 || blinkTime == INFINITE // 0 indicates error + ? STYLE_CURSOR_NOBLINKTIME : blinkTime ); aStyleSettings.SetFloatTitleHeight( GetSystemMetrics( SM_CYSMCAPTION ) ); aStyleSettings.SetTitleHeight( GetSystemMetrics( SM_CYCAPTION ) ); aStyleSettings.SetActiveBorderColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVEBORDER ) ) ); |