From 1995e565ce6566fced7a383d8114319da57974d5 Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 12 Jun 2017 13:49:46 +1000 Subject: Simplify mouse and keyboard handling by only retaining the 'WithModifiers" form. All events include a set of keyboard modifier flags. Older calls that passed individual parameters for each key were removed. --- src/Editor.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/Editor.h') diff --git a/src/Editor.h b/src/Editor.h index 69c816270..8adcff769 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -425,19 +425,13 @@ protected: // ScintillaBase subclass needs access to much of Editor void NotifySavePoint(bool isSavePoint); void NotifyModifyAttempt(); virtual void NotifyDoubleClick(Point pt, int modifiers); - virtual void NotifyDoubleClick(Point pt, bool shift, bool ctrl, bool alt); void NotifyHotSpotClicked(Sci::Position position, int modifiers); - void NotifyHotSpotClicked(Sci::Position position, bool shift, bool ctrl, bool alt); void NotifyHotSpotDoubleClicked(Sci::Position position, int modifiers); - void NotifyHotSpotDoubleClicked(Sci::Position position, bool shift, bool ctrl, bool alt); void NotifyHotSpotReleaseClick(Sci::Position position, int modifiers); - void NotifyHotSpotReleaseClick(Sci::Position position, bool shift, bool ctrl, bool alt); bool NotifyUpdateUI(); void NotifyPainted(); void NotifyIndicatorClick(bool click, Sci::Position position, int modifiers); - void NotifyIndicatorClick(bool click, Sci::Position position, bool shift, bool ctrl, bool alt); bool NotifyMarginClick(Point pt, int modifiers); - bool NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt); bool NotifyMarginRightClick(Point pt, int modifiers); void NotifyNeedShown(Sci::Position pos, Sci::Position len); void NotifyDwelling(Point pt, bool state); @@ -476,7 +470,6 @@ protected: // ScintillaBase subclass needs access to much of Editor virtual int KeyCommand(unsigned int iMessage); virtual int KeyDefault(int /* key */, int /*modifiers*/); int KeyDownWithModifiers(int key, int modifiers, bool *consumed); - int KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed=0); void Indent(bool forwards); @@ -510,10 +503,8 @@ protected: // ScintillaBase subclass needs access to much of Editor void MouseLeave(); virtual void ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers); virtual void RightButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers); - virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt); - void ButtonMoveWithModifiers(Point pt, int modifiers); - void ButtonMove(Point pt); - void ButtonUp(Point pt, unsigned int curTime, bool ctrl); + void ButtonMoveWithModifiers(Point pt, unsigned int curTime, int modifiers); + void ButtonUpWithModifiers(Point pt, unsigned int curTime, int modifiers); void Tick(); bool Idle(); -- cgit v1.2.3