From: <geo...@us...> - 2011-01-07 05:29:26
|
Revision: 3950 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3950&view=rev Author: geoffthemedio Date: 2011-01-07 05:29:19 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Removed unnecessary Wnd* parent parameter from SystemIcon constructor. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp trunk/FreeOrion/UI/SystemIcon.cpp trunk/FreeOrion/UI/SystemIcon.h Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2011-01-05 21:02:17 UTC (rev 3949) +++ trunk/FreeOrion/UI/MapWnd.cpp 2011-01-07 05:29:19 UTC (rev 3950) @@ -1886,7 +1886,7 @@ continue; // create new system icon - SystemIcon* icon = new SystemIcon(this, GG::X0, GG::Y0, GG::X(10), start_system->ID()); + SystemIcon* icon = new SystemIcon(GG::X0, GG::Y0, GG::X(10), start_system->ID()); m_system_icons[start_system->ID()] = icon; icon->InstallEventFilter(this); if (SidePanel::SystemID() == systems[i]->ID()) Modified: trunk/FreeOrion/UI/SystemIcon.cpp =================================================================== --- trunk/FreeOrion/UI/SystemIcon.cpp 2011-01-05 21:02:17 UTC (rev 3949) +++ trunk/FreeOrion/UI/SystemIcon.cpp 2011-01-07 05:29:19 UTC (rev 3950) @@ -218,7 +218,7 @@ //////////////////////////////////////////////// // SystemIcon //////////////////////////////////////////////// -SystemIcon::SystemIcon(GG::Wnd* parent, GG::X x, GG::Y y, GG::X w, int system_id) : +SystemIcon::SystemIcon(GG::X x, GG::Y y, GG::X w, int system_id) : GG::Control(x, y, w, GG::Y(Value(w)), GG::INTERACTIVE), m_system_id(system_id), m_tiny_graphic(0), @@ -246,9 +246,6 @@ m_tiny_texture = m_disc_texture; } - if (parent) - parent->AttachChild(this); - Init(); } Modified: trunk/FreeOrion/UI/SystemIcon.h =================================================================== --- trunk/FreeOrion/UI/SystemIcon.h 2011-01-05 21:02:17 UTC (rev 3949) +++ trunk/FreeOrion/UI/SystemIcon.h 2011-01-07 05:29:19 UTC (rev 3950) @@ -45,8 +45,8 @@ //!@} //! \name Structors //!@{ - SystemIcon(GG::Wnd* parent, GG::X x, GG::Y y, GG::X w, int system_id); //!< construct from a universe ID at specified size and position - ~SystemIcon(); //!< dtor + SystemIcon(GG::X x, GG::Y y, GG::X w, int system_id); //!< construct from a universe ID at specified size and position + ~SystemIcon(); //!< dtor //!@} //! \name Accessors //!@{ |