mail[Wesnoth-commits] r33213 - in /trunk: changelog src/gui/widgets/window.cpp src/gui/widgets/window.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on March 01, 2009 - 12:01:
Author: mordante
Date: Sun Mar  1 12:01:33 2009
New Revision: 33213

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33213&view=rev
Log:
Properly set the cursor when opening a dialog.

Fixes bug #12961.

Modified:
    trunk/changelog
    trunk/src/gui/widgets/window.cpp
    trunk/src/gui/widgets/window.hpp

Modified: trunk/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=33213&r1=33212&r2=33213&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sun Mar  1 12:01:33 2009
@@ -17,6 +17,7 @@
    * 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

Modified: trunk/src/gui/widgets/window.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/window.cpp?rev=33213&r1=33212&r2=33213&view=diff
==============================================================================
--- trunk/src/gui/widgets/window.cpp (original)
+++ trunk/src/gui/widgets/window.cpp Sun Mar  1 12:01:33 2009
@@ -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 @@
                const std::string& definition)
        : tpanel()
        , tevent_handler()
+       , cursor::setter(cursor::NORMAL)
        , video_(video)
        , status_(NEW)
        , retval_(0)

Modified: trunk/src/gui/widgets/window.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/window.hpp?rev=33213&r1=33212&r2=33213&view=diff
==============================================================================
--- trunk/src/gui/widgets/window.hpp (original)
+++ trunk/src/gui/widgets/window.hpp Sun Mar  1 12:01:33 2009
@@ -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 @@
  * 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;
 




Related Messages


Powered by MHonArc, Updated Sun Mar 01 12:20:06 2009