Mercurial > hg > orthanc-stone
diff Framework/Widgets/TestCairoWidget.h @ 728:8190213e2279 am-dev
Merged default into am-dev
author | Alain Mazy <am@osimis.io> |
---|---|
date | Tue, 21 May 2019 13:25:58 +0200 |
parents | 4f2416d519b4 |
children |
line wrap: on
line diff
--- a/Framework/Widgets/TestCairoWidget.h Thu May 16 19:10:38 2019 +0200 +++ b/Framework/Widgets/TestCairoWidget.h Tue May 21 13:25:58 2019 +0200 @@ -23,7 +23,7 @@ #include "CairoWidget.h" -namespace OrthancStone +namespace Deprecated { namespace Samples { @@ -36,9 +36,9 @@ bool animate_; protected: - virtual bool RenderCairo(CairoContext& context); + virtual bool RenderCairo(OrthancStone::CairoContext& context); - virtual void RenderMouseOverCairo(CairoContext& context, + virtual void RenderMouseOverCairo(OrthancStone::CairoContext& context, int x, int y); @@ -48,20 +48,20 @@ virtual void SetSize(unsigned int width, unsigned int height); - virtual IMouseTracker* CreateMouseTracker(MouseButton button, + virtual IMouseTracker* CreateMouseTracker(OrthancStone::MouseButton button, int x, int y, - KeyboardModifiers modifiers, + OrthancStone::KeyboardModifiers modifiers, const std::vector<Touch>& touches); - virtual void MouseWheel(MouseWheelDirection direction, + virtual void MouseWheel(OrthancStone::MouseWheelDirection direction, int x, int y, - KeyboardModifiers modifiers); + OrthancStone::KeyboardModifiers modifiers); - virtual void KeyPressed(KeyboardKeys key, + virtual void KeyPressed(OrthancStone::KeyboardKeys key, char keyChar, - KeyboardModifiers modifiers); + OrthancStone::KeyboardModifiers modifiers); virtual bool HasAnimation() const {