From: <tz...@us...> - 2009-02-14 03:07:01
|
Revision: 2814 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2814&view=rev Author: tzlaine Date: 2009-02-14 03:06:58 +0000 (Sat, 14 Feb 2009) Log Message: ----------- CombatWnd now accepts keyboard input. Modified Paths: -------------- trunk/FreeOrion/UI/CombatWnd.cpp trunk/FreeOrion/UI/CombatWnd.h Modified: trunk/FreeOrion/UI/CombatWnd.cpp =================================================================== --- trunk/FreeOrion/UI/CombatWnd.cpp 2009-02-13 21:53:36 UTC (rev 2813) +++ trunk/FreeOrion/UI/CombatWnd.cpp 2009-02-14 03:06:58 UTC (rev 2814) @@ -1164,7 +1164,7 @@ UpdateCameraPosition(); } -void CombatWnd::KeyPress(GG::Key key, GG::Flags<GG::ModKey> mod_keys) +void CombatWnd::KeyPress(GG::Key key, boost::uint32_t key_code_point, GG::Flags<GG::ModKey> mod_keys) { if (key == GG::GGK_q && mod_keys & GG::MOD_KEY_CTRL) m_exit = true; Modified: trunk/FreeOrion/UI/CombatWnd.h =================================================================== --- trunk/FreeOrion/UI/CombatWnd.h 2009-02-13 21:53:36 UTC (rev 2813) +++ trunk/FreeOrion/UI/CombatWnd.h 2009-02-14 03:06:58 UTC (rev 2814) @@ -67,7 +67,7 @@ virtual void RClick(const GG::Pt& pt, GG::Flags<GG::ModKey> mod_keys); virtual void RDoubleClick(const GG::Pt& pt, GG::Flags<GG::ModKey> mod_keys); virtual void MouseWheel(const GG::Pt& pt, int move, GG::Flags<GG::ModKey> mod_keys); - virtual void KeyPress(GG::Key key, GG::Flags<GG::ModKey> mod_keys); + virtual void KeyPress(GG::Key key, boost::uint32_t key_code_point, GG::Flags<GG::ModKey> mod_keys); private: struct SelectedObject |