Menu
▾
▴
[Freeorion-programmers] SF.net SVN: freeorion: [1756] trunk/FreeOrion/UI
|
From: <tz...@us...> - 2006-02-17 16:43:50
|
Revision: 1756 Author: tzlaine Date: 2006-02-17 08:43:45 -0800 (Fri, 17 Feb 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1756&view=rev Log Message: ----------- Changed the signatures of *::MouseLeave() and *::DragDropLeave() to keep in synch with recent GG changes. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp trunk/FreeOrion/UI/CUIControls.h trunk/FreeOrion/UI/FleetWnd.cpp trunk/FreeOrion/UI/FocusSelector.cpp trunk/FreeOrion/UI/FocusSelector.h trunk/FreeOrion/UI/LinkText.cpp trunk/FreeOrion/UI/LinkText.h trunk/FreeOrion/UI/ProductionWnd.cpp trunk/FreeOrion/UI/ResearchWnd.cpp trunk/FreeOrion/UI/SystemIcon.cpp trunk/FreeOrion/UI/SystemIcon.h trunk/FreeOrion/UI/TechTreeWnd.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/CUIControls.cpp 2006-02-17 16:43:45 UTC (rev 1756) @@ -391,7 +391,7 @@ m_mouse_here = true; } -void CUIStateButton::MouseLeave(const GG::Pt& pt, Uint32 keys) +void CUIStateButton::MouseLeave() { m_mouse_here = false; } @@ -512,7 +512,7 @@ } } -void CUIScroll::ScrollTab::MouseLeave(const GG::Pt& pt, Uint32 keys) +void CUIScroll::ScrollTab::MouseLeave() { if (!m_being_dragged) m_mouse_here = false; @@ -637,7 +637,7 @@ m_mouse_here = true; } -void CUIDropDownList::MouseLeave(const GG::Pt& pt, Uint32 keys) +void CUIDropDownList::MouseLeave() { m_mouse_here = false; } Modified: trunk/FreeOrion/UI/CUIControls.h =================================================================== --- trunk/FreeOrion/UI/CUIControls.h 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/CUIControls.h 2006-02-17 16:43:45 UTC (rev 1756) @@ -149,7 +149,7 @@ /** \name Mutators */ //@{ virtual void Render(); virtual void MouseEnter(const GG::Pt& pt, Uint32 keys); - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys); + virtual void MouseLeave(); //@} private: @@ -173,7 +173,7 @@ virtual void LButtonUp(const GG::Pt& pt, Uint32 keys); virtual void LClick(const GG::Pt& pt, Uint32 keys); virtual void MouseEnter(const GG::Pt& pt, Uint32 keys); - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys); + virtual void MouseLeave(); private: GG::Clr m_border_color; GG::Orientation m_orientation; @@ -229,7 +229,7 @@ virtual void Render(); virtual void LClick(const GG::Pt& pt, Uint32 keys); virtual void MouseEnter(const GG::Pt& pt, Uint32 keys); - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys); + virtual void MouseLeave(); void DisableDropArrow(); ///< disables rendering of the small downward-facing arrow on the right of the control void EnableDropArrow(); ///< enables rendering of the small downward-facing arrow on the right of the control Modified: trunk/FreeOrion/UI/FleetWnd.cpp =================================================================== --- trunk/FreeOrion/UI/FleetWnd.cpp 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/FleetWnd.cpp 2006-02-17 16:43:45 UTC (rev 1756) @@ -38,7 +38,7 @@ virtual void Render(); virtual void DragDropEnter(const GG::Pt& pt, const std::map<Wnd*, GG::Pt>& drag_drop_wnds, Uint32 keys); - virtual void DragDropLeave(const GG::Pt& pt, const std::map<Wnd*, GG::Pt>& drag_drop_wnds, Uint32 keys); + virtual void DragDropLeave(); virtual void AcceptDrops(std::list<Wnd*>& wnds, const GG::Pt& pt); void Select(bool b); @@ -309,7 +309,7 @@ } } -void FleetDataPanel::DragDropLeave(const GG::Pt& pt, const std::map<Wnd*, GG::Pt>& drag_drop_wnds, Uint32 keys) +void FleetDataPanel::DragDropLeave() { Select(false); } @@ -583,7 +583,7 @@ } } - virtual void DragDropLeave(const GG::Pt& pt, const std::map<Wnd*, GG::Pt>& drag_drop_wnds, Uint32 keys) + virtual void DragDropLeave() { ClearSelection(); } Modified: trunk/FreeOrion/UI/FocusSelector.cpp =================================================================== --- trunk/FreeOrion/UI/FocusSelector.cpp 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/FocusSelector.cpp 2006-02-17 16:43:45 UTC (rev 1756) @@ -70,7 +70,7 @@ m_mouse_here = true; } -void FocusButton::MouseLeave(const GG::Pt& pt, Uint32 keys) +void FocusButton::MouseLeave() { m_mouse_here = false; } @@ -255,7 +255,7 @@ m_mouse_here = true; } -void FocusSelector::MouseLeave(const GG::Pt& pt, Uint32 keys) +void FocusSelector::MouseLeave() { m_mouse_here = false; } Modified: trunk/FreeOrion/UI/FocusSelector.h =================================================================== --- trunk/FreeOrion/UI/FocusSelector.h 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/FocusSelector.h 2006-02-17 16:43:45 UTC (rev 1756) @@ -16,7 +16,7 @@ virtual void Render(); virtual void RClick(const GG::Pt& pt, Uint32 keys); virtual void MouseEnter(const GG::Pt& pt, Uint32 keys); - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys); + virtual void MouseLeave(); void SetImage(const boost::shared_ptr<GG::Texture>& image); mutable ClickedSignalType RightClickedSignal; @@ -54,7 +54,7 @@ virtual void LClick(const GG::Pt& pt, Uint32 keys); virtual void RClick(const GG::Pt& pt, Uint32 keys); virtual void MouseEnter(const GG::Pt& pt, Uint32 keys); - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys); + virtual void MouseLeave(); void Update(const ResourceCenter& resource_center); mutable FocusChangedSignalType PrimaryFocusChangedSignal; Modified: trunk/FreeOrion/UI/LinkText.cpp =================================================================== --- trunk/FreeOrion/UI/LinkText.cpp 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/LinkText.cpp 2006-02-17 16:43:45 UTC (rev 1756) @@ -103,7 +103,7 @@ } } -void LinkText::MouseLeave(const GG::Pt& pt, Uint32 keys) +void LinkText::MouseLeave() { ClearOldRollover(); } Modified: trunk/FreeOrion/UI/LinkText.h =================================================================== --- trunk/FreeOrion/UI/LinkText.h 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/LinkText.h 2006-02-17 16:43:45 UTC (rev 1756) @@ -59,7 +59,7 @@ virtual void LButtonUp(const GG::Pt& pt, Uint32 keys); virtual void LClick(const GG::Pt& pt, Uint32 keys); virtual void MouseHere(const GG::Pt& pt, Uint32 keys); - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys); + virtual void MouseLeave(); /** sets the text to \a str; may resize the window. If the window was constructed to fit the size of the text (i.e. if the second ctor type was used), calls to this function cause the window to be resized to whatever Modified: trunk/FreeOrion/UI/ProductionWnd.cpp =================================================================== --- trunk/FreeOrion/UI/ProductionWnd.cpp 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/ProductionWnd.cpp 2006-02-17 16:43:45 UTC (rev 1756) @@ -90,7 +90,7 @@ m_drop_point = -1; } } - virtual void DragDropLeave(const GG::Pt& pt, const std::map<Wnd*, GG::Pt>& drag_drop_wnds, Uint32 keys) + virtual void DragDropLeave() { m_drop_point = -1; } Modified: trunk/FreeOrion/UI/ResearchWnd.cpp =================================================================== --- trunk/FreeOrion/UI/ResearchWnd.cpp 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/ResearchWnd.cpp 2006-02-17 16:43:45 UTC (rev 1756) @@ -90,7 +90,7 @@ m_drop_point = -1; } } - virtual void DragDropLeave(const GG::Pt& pt, const std::map<Wnd*, GG::Pt>& drag_drop_wnds, Uint32 keys) + virtual void DragDropLeave() { m_drop_point = -1; } Modified: trunk/FreeOrion/UI/SystemIcon.cpp =================================================================== --- trunk/FreeOrion/UI/SystemIcon.cpp 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/SystemIcon.cpp 2006-02-17 16:43:45 UTC (rev 1756) @@ -138,7 +138,7 @@ MouseEnteringSignal(m_system.ID()); } -void SystemIcon::MouseLeave(const GG::Pt& pt, Uint32 keys) +void SystemIcon::MouseLeave() { m_static_graphic->SetColor(m_default_star_color); MouseLeavingSignal(m_system.ID()); Modified: trunk/FreeOrion/UI/SystemIcon.h =================================================================== --- trunk/FreeOrion/UI/SystemIcon.h 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/SystemIcon.h 2006-02-17 16:43:45 UTC (rev 1756) @@ -60,7 +60,7 @@ virtual void RClick(const GG::Pt& pt, Uint32 keys); virtual void LDoubleClick(const GG::Pt& pt, Uint32 keys); virtual void MouseEnter(const GG::Pt& pt, Uint32 keys); - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys); + virtual void MouseLeave(); void Refresh(); //!< sets up the icon's fleet buttons, generates fleet movement lines, etc. Should be called after an icon is attached to the map void ClickFleetButton(Fleet* fleet); //!< clicks the FleetButton containing \a fleet Modified: trunk/FreeOrion/UI/TechTreeWnd.cpp =================================================================== --- trunk/FreeOrion/UI/TechTreeWnd.cpp 2006-02-17 15:49:27 UTC (rev 1755) +++ trunk/FreeOrion/UI/TechTreeWnd.cpp 2006-02-17 16:43:45 UTC (rev 1756) @@ -372,7 +372,7 @@ virtual void MouseEnter(const GG::Pt& pt, Uint32 keys) {m_mouse_here = true;} - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys) {m_mouse_here = false;} + virtual void MouseLeave() {m_mouse_here = false;} void SetSelected(bool s) {m_selected = s;} @@ -630,7 +630,7 @@ virtual void Render(); virtual void LClick(const GG::Pt& pt, Uint32 keys) {ClickedSignal(m_tech);} virtual void MouseEnter(const GG::Pt& pt, Uint32 keys) {m_selected = true;} - virtual void MouseLeave(const GG::Pt& pt, Uint32 keys) {m_selected = false;} + virtual void MouseLeave() {m_selected = false;} const Tech * const m_tech; GG::Clr m_border_color; GG::TextControl* m_name_text; |