diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 18:33:43 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 19:20:03 +0300 |
| commit | 708fc1c187986796861c4dcecba2861ce272dd57 (patch) | |
| tree | eddd1b2260db90b6727e69b977a4f48922b6b6b2 /vcl/source/edit | |
| parent | f74a6338b3897df49f3041e7ce33453eaba9e2e5 (diff) | |
fdo#82577, fdo#82579: Handle Cursor
Put the vcl Cursor in the vcl namespace. Avoids collision with the Xlib Cursor
typedef and some ancient Carbon (?) Cursor typedef on OS X.
Change-Id: I7af770c522b5774c87f58cc079ced9fc1bcc88b0
Diffstat (limited to 'vcl/source/edit')
| -rw-r--r-- | vcl/source/edit/textdat2.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/edit/textview.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index c9b3b77a0be5..85f3b36938d9 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -271,7 +271,7 @@ public: struct TextDDInfo { - Cursor maCursor; + vcl::Cursor maCursor; TextPaM maDropPos; bool mbStarterOfDD; diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 2be376153832..b607caf7abf9 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -151,7 +151,7 @@ struct ImpTextView Point maStartDocPos; // TextPaM maMBDownPaM; - Cursor* mpCursor; + vcl::Cursor* mpCursor; TextDDInfo* mpDDInfo; @@ -204,7 +204,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) : mpImpl->mpSelEngine->SetSelectionMode( RANGE_SELECTION ); mpImpl->mpSelEngine->EnableDrag( true ); - mpImpl->mpCursor = new Cursor; + mpImpl->mpCursor = new vcl::Cursor; mpImpl->mpCursor->Show(); pWindow->SetCursor( mpImpl->mpCursor ); pWindow->SetInputContext( InputContext( pEng->GetFont(), INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT ) ); |