diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-14 12:00:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-14 12:00:41 +0200 |
| commit | 68041a0546fc6a05608411365c8382937aafac79 (patch) | |
| tree | c0676833d41c491956c71b946f7c69ca0a34f734 /vcl/unx/generic/window | |
| parent | 741d9990bf9d9dfcba1166a12ffb1d846c912181 (diff) | |
convert INPUTCONTEXT_ constants to scoped enum
Change-Id: I5b99e42a3e85527b27d515c468d2ed66386fc9df
Diffstat (limited to 'vcl/unx/generic/window')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 610314a9c384..4f428dcdec2b 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2463,13 +2463,13 @@ void X11SalFrame::Sync() void X11SalFrame::SetInputContext( SalInputContext* pContext ) { - if (pContext == NULL) + if (pContext == NULL) return; - // 1. We should create an input context for this frame - // only when SAL_INPUTCONTEXT_TEXT is set. + // 1. We should create an input context for this frame + // only when InputContextFlags::Text is set. - if (!(pContext->mnOptions & SAL_INPUTCONTEXT_TEXT)) + if (!(pContext->mnOptions & InputContextFlags::Text)) { if( mpInputContext ) mpInputContext->Unmap( this ); @@ -2477,9 +2477,9 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext ) } // 2. We should use on-the-spot inputstyle - // only when SAL_INPUTCONTEXT_EXTTEXTINPUT is set. + // only when InputContextFlags::ExtTExt is set. - if (mpInputContext == NULL) + if (mpInputContext == NULL) { vcl::I18NStatus& rStatus( vcl::I18NStatus::get() ); rStatus.setParent( this ); @@ -2490,10 +2490,10 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext ) if (mbInputFocus) mpInputContext->SetICFocus( this ); } - } + } else mpInputContext->Map( this ); - return; + return; } void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags ) |