Properly set the cursor when opening a dialog.

Fixes bug #12961.
This commit is contained in:
Mark de Wever 2009-03-01 11:01:33 +00:00
parent 19fc6b8d4b
commit b12ac11399
3 changed files with 7 additions and 2 deletions

View file

@ -17,6 +17,7 @@ Version 1.5.11+svn:
* Changed the widgets in the in game message dialog
* The multiplayer dialog shows tooltips again
* The textbox history now uses CTRL+TAB and CTRL+SHIFT+TAB
* Properly set the cursor when opening a dialog (bug #12961)
* WML Engine:
* Fix incorrect or doubled "sighted" events when delaying shroud update
* Fix sometimes doubled "select" events

View file

@ -21,7 +21,6 @@
#include "gui/widgets/window.hpp"
#include "cursor.hpp"
#include "font.hpp"
#include "foreach.hpp"
#ifdef DEBUG_WINDOW_LAYOUT_GRAPHS
@ -95,6 +94,7 @@ twindow::twindow(CVideo& video,
const std::string& definition)
: tpanel()
, tevent_handler()
, cursor::setter(cursor::NORMAL)
, video_(video)
, status_(NEW)
, retval_(0)

View file

@ -21,6 +21,7 @@
#ifndef GUI_WIDGETS_WINDOW_HPP_INCLUDED
#define GUI_WIDGETS_WINDOW_HPP_INCLUDED
#include "cursor.hpp"
#include "gui/widgets/event_handler.hpp"
#include "gui/widgets/formula.hpp"
#include "gui/widgets/helper.hpp"
@ -44,7 +45,10 @@ class tdebug_layout_graph;
* base class of top level items, the only item
* which needs to store the final canvase to draw on
*/
class twindow : public tpanel, public tevent_handler
class twindow
: public tpanel
, public tevent_handler
, public cursor::setter
{
friend class tdebug_layout_graph;