[aseprite] 248/308: Call onEnterState() from base class in SelectBoxState and StandbyState

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit ef4a4822dafcb878fa05683455b5fa75dcb2ddc3
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Feb 18 11:40:11 2016 -0300

    Call onEnterState() from base class in SelectBoxState and StandbyState
---
 src/app/ui/editor/select_box_state.cpp | 4 +++-
 src/app/ui/editor/standby_state.cpp    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/editor/select_box_state.cpp b/src/app/ui/editor/select_box_state.cpp
index 1f42c35..41af6b2 100644
--- a/src/app/ui/editor/select_box_state.cpp
+++ b/src/app/ui/editor/select_box_state.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -68,6 +68,8 @@ void SelectBoxState::setBoxBounds(const gfx::Rect& box)
 
 void SelectBoxState::onEnterState(Editor* editor)
 {
+  StandbyState::onEnterState(editor);
+
   updateContextBar();
 
   editor->setDecorator(this);
diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index 2930e8e..6927290 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -99,6 +99,8 @@ StandbyState::~StandbyState()
 
 void StandbyState::onEnterState(Editor* editor)
 {
+  StateWithWheelBehavior::onEnterState(editor);
+
   editor->setDecorator(m_decorator);
 
   m_pivotVisConn =

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git