diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-04-03 00:48:56 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-04-03 01:07:01 +0200 |
| commit | 82cc9c0cf2cdb8de17233a2ea943a5247d5da305 (patch) | |
| tree | af341aed11c15ac3ab54de6c62e56251c859d76f /src/menu/mouse_manager.cpp | |
| parent | 263ef7f8c7085b90f8d21e3dfc2598ed7340e73d (diff) | |
| download | usdx-82cc9c0cf2cdb8de17233a2ea943a5247d5da305.tar.gz usdx-82cc9c0cf2cdb8de17233a2ea943a5247d5da305.tar.xz usdx-82cc9c0cf2cdb8de17233a2ea943a5247d5da305.zip | |
menu/application: Remove singleton.
The singleton pattern should not be used in most cases, because it
behaves like global variables.
Diffstat (limited to 'src/menu/mouse_manager.cpp')
| -rw-r--r-- | src/menu/mouse_manager.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/menu/mouse_manager.cpp b/src/menu/mouse_manager.cpp index 3be6cb1b..db4db7ea 100644 --- a/src/menu/mouse_manager.cpp +++ b/src/menu/mouse_manager.cpp @@ -24,6 +24,7 @@ #include <cstddef> +#include "application.hpp" #include "mouse_manager.hpp" #include "utils/rectangle.hpp" #include "container.hpp" @@ -34,8 +35,8 @@ namespace usdx log4cpp::Category& MouseManager::log = log4cpp::Category::getInstance("usdx.menu.mouse_manager"); - MouseManager::MouseManager(EventManager& event_manager) - : last_active(NULL) + MouseManager::MouseManager(Application* app, EventManager& event_manager) + : app(app), last_active(NULL) { mouse_move_connection = event_manager.mouse_move.connect( boost::bind(&MouseManager::on_mouse_move, this, _1)); @@ -75,7 +76,7 @@ namespace usdx { if (current == NULL) { // start search from top level - return Application::get_instance(); + return app; } if (!current->get_absolut_rect().is_in(p)) { |