diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 09:45:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 12:57:24 +0000 |
| commit | f61b6894ef8d953b03307c7b27c3a67b9a41bea9 (patch) | |
| tree | b6f75537b2d579e4aa85b0259a02475644af9a99 | |
| parent | cb40b7d2f9902b5fbe89333c4107d72c156b9a15 (diff) | |
GetContextMenuDown is always true
Change-Id: Ib2ce1dd91cc7bfaf38feca7b056874a2508869e6
| -rw-r--r-- | include/vcl/settings.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 6 |
3 files changed, 1 insertions, 17 deletions
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index ba2aae2f43ec..588a1b9c9e75 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -101,8 +101,6 @@ public: sal_uInt16 GetContextMenuClicks() const; - bool GetContextMenuDown() const; - sal_uLong GetScrollRepeat() const; sal_uLong GetButtonStartRepeat() const; diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index b5b3b6005fe5..49a0691be3d5 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -68,7 +68,6 @@ struct ImplMouseData sal_uInt16 mnStartDragCode; sal_uInt16 mnContextMenuCode; sal_uInt16 mnContextMenuClicks; - bool mbContextMenuDown; sal_uLong mnScrollRepeat; sal_uLong mnButtonStartRepeat; sal_uLong mnButtonRepeat; @@ -260,7 +259,6 @@ ImplMouseData::ImplMouseData() mnStartDragCode = MOUSE_LEFT; mnContextMenuCode = MOUSE_RIGHT; mnContextMenuClicks = 1; - mbContextMenuDown = true; mnMiddleButtonAction = MOUSE_MIDDLE_AUTOSCROLL; mnScrollRepeat = 100; mnButtonStartRepeat = 370; @@ -282,7 +280,6 @@ ImplMouseData::ImplMouseData( const ImplMouseData& rData ) mnStartDragCode = rData.mnStartDragCode; mnContextMenuCode = rData.mnContextMenuCode; mnContextMenuClicks = rData.mnContextMenuClicks; - mbContextMenuDown = rData.mbContextMenuDown; mnMiddleButtonAction = rData.mnMiddleButtonAction; mnScrollRepeat = rData.mnScrollRepeat; mnButtonStartRepeat = rData.mnButtonStartRepeat; @@ -389,12 +386,6 @@ MouseSettings::GetContextMenuClicks() const return mpData->mnContextMenuClicks; } -bool -MouseSettings::GetContextMenuDown() const -{ - return mpData->mbContextMenuDown; -} - sal_uLong MouseSettings::GetScrollRepeat() const { @@ -519,7 +510,6 @@ bool MouseSettings::operator ==( const MouseSettings& rSet ) const (mpData->mnStartDragCode == rSet.mpData->mnStartDragCode) && (mpData->mnContextMenuCode == rSet.mpData->mnContextMenuCode) && (mpData->mnContextMenuClicks == rSet.mpData->mnContextMenuClicks) && - (mpData->mbContextMenuDown == rSet.mpData->mbContextMenuDown) && (mpData->mnMiddleButtonAction == rSet.mpData->mnMiddleButtonAction) && (mpData->mnScrollRepeat == rSet.mpData->mnScrollRepeat) && (mpData->mnButtonStartRepeat == rSet.mpData->mnButtonStartRepeat) && diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index b81fb9d8728c..003795a7da3e 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -820,11 +820,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav if ( (nCode == rMSettings.GetContextMenuCode()) && (nClicks == rMSettings.GetContextMenuClicks()) ) { - bool bContextMenu; - if ( rMSettings.GetContextMenuDown() ) - bContextMenu = (nSVEvent == EVENT_MOUSEBUTTONDOWN); - else - bContextMenu = (nSVEvent == EVENT_MOUSEBUTTONUP); + bool bContextMenu = (nSVEvent == EVENT_MOUSEBUTTONDOWN); if ( bContextMenu ) { if( pSVData->maAppData.mpActivePopupMenu ) |