diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-28 13:01:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-28 13:01:56 +0200 |
| commit | b406664c0c3f9c8a383e47c7eb045657cd3fdd83 (patch) | |
| tree | 4cc0eec51a312d2a06caf548f2775203a46be2f3 /vcl | |
| parent | d5129a9dd68978f9eccdd4597b5b6834557c422a (diff) | |
GetFocusFlags::Cursor->GetFocusFlags::CURSOR
to avoid name-clash with X11 headers
Change-Id: I727c523f6d9bd7d4db28fe7427e053903626be00
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dlgctrl.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 05eb6054b62f..51982fcc5301 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1901,7 +1901,7 @@ void Edit::GetFocus() SelectionOptions nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); if ( !( GetStyle() & (WB_NOHIDESELECTION|WB_READONLY) ) - && ( GetGetFocusFlags() & (GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::Cursor|GetFocusFlags::Mnemonic) ) ) + && ( GetGetFocusFlags() & (GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::CURSOR|GetFocusFlags::Mnemonic) ) ) { if ( nSelOptions & SelectionOptions::ShowFirst ) { diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 5cd07062cfa5..3039e78a2efe 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -543,7 +543,7 @@ namespace if (isSuitableDestination(pWindow)) { - pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Forward ); + pWindow->ImplControlFocus( GetFocusFlags::CURSOR | GetFocusFlags::Forward ); return true; } } @@ -554,7 +554,7 @@ namespace if (isSuitableDestination(pWindow)) { - pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Forward ); + pWindow->ImplControlFocus( GetFocusFlags::CURSOR | GetFocusFlags::Forward ); return true; } } @@ -868,7 +868,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) if (isSuitableDestination(pWindow)) { if ( pWindow != pSWindow ) - pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Backward ); + pWindow->ImplControlFocus( GetFocusFlags::CURSOR | GetFocusFlags::Backward ); return true; } @@ -898,7 +898,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) if (isSuitableDestination(pWindow)) { - pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Backward ); + pWindow->ImplControlFocus( GetFocusFlags::CURSOR | GetFocusFlags::Backward ); return true; } |