[Freeorion-programmers] SF.net SVN: freeorion:[7667] trunk/FreeOrion

[<mar...@us...>]

Revision: 7667
          http://sourceforge.net/p/freeorion/code/7667
Author:   marcel_metz
Date:     2014-08-29 11:51:58 +0000 (Fri, 29 Aug 2014)
Log Message:
-----------
Removed position parameter from GG::TabBar.

Modified Paths:
--------------
    trunk/FreeOrion/GG/GG/TabWnd.h
    trunk/FreeOrion/GG/src/StyleFactory.cpp
    trunk/FreeOrion/GG/src/TabWnd.cpp
    trunk/FreeOrion/UI/CUIControls.cpp

Modified: trunk/FreeOrion/GG/GG/TabWnd.h
===================================================================
--- trunk/FreeOrion/GG/GG/TabWnd.h	2014-08-29 11:51:39 UTC (rev 7666)
+++ trunk/FreeOrion/GG/GG/TabWnd.h	2014-08-29 11:51:58 UTC (rev 7667)
@@ -214,7 +214,7 @@
 
     /** \name Structors */ ///@{
     /** Basic ctor. */
-    TabBar(X x, Y y, X w, const boost::shared_ptr<Font>& font, Clr color, Clr text_color = CLR_BLACK,
+    TabBar(const boost::shared_ptr<Font>& font, Clr color, Clr text_color = CLR_BLACK,
            TabBarStyle style = TAB_BAR_ATTACHED, Flags<WndFlag> flags = INTERACTIVE);
     //@}
 

Modified: trunk/FreeOrion/GG/src/StyleFactory.cpp
===================================================================
--- trunk/FreeOrion/GG/src/StyleFactory.cpp	2014-08-29 11:51:39 UTC (rev 7666)
+++ trunk/FreeOrion/GG/src/StyleFactory.cpp	2014-08-29 11:51:58 UTC (rev 7667)
@@ -108,7 +108,7 @@
 
 TabBar* StyleFactory::NewTabBar(const boost::shared_ptr<Font>& font, Clr color, Clr text_color/* = CLR_BLACK*/,
                                 TabBarStyle style/* = TAB_BAR_ATTACHED*/) const
-{ return new TabBar(X0, Y0, X1, font, color, text_color, style, INTERACTIVE); }
+{ return new TabBar(font, color, text_color, style, INTERACTIVE); }
 
 ListBox* StyleFactory::NewDropDownListListBox(Clr color, Clr interior/* = CLR_ZERO*/) const
 { return NewListBox(color, interior); }

Modified: trunk/FreeOrion/GG/src/TabWnd.cpp
===================================================================
--- trunk/FreeOrion/GG/src/TabWnd.cpp	2014-08-29 11:51:39 UTC (rev 7666)
+++ trunk/FreeOrion/GG/src/TabWnd.cpp	2014-08-29 11:51:58 UTC (rev 7667)
@@ -251,14 +251,14 @@
 const std::size_t TabBar::NO_TAB = TabWnd::NO_WND;
 const X TabBar::BUTTON_WIDTH(10);
 
-TabBar::TabBar(X x, Y y, X w, const boost::shared_ptr<Font>& font, Clr color, Clr text_color/* = CLR_BLACK*/,
+TabBar::TabBar(const boost::shared_ptr<Font>& font, Clr color, Clr text_color/* = CLR_BLACK*/,
                TabBarStyle style/* = TAB_BAR_ATTACHED*/, Flags<WndFlag> flags/* = INTERACTIVE*/) :
-    Control(x, y, w, TabHeightFromFont(font), flags),
+    Control(X0, Y0, X1, TabHeightFromFont(font), flags),
     m_tabs(0),
     m_font(font),
     m_left_button(0),
     m_right_button(0),
-    m_left_right_button_layout(new Layout(X0, Y0, w, TabHeightFromFont(font), 1, 3)),
+    m_left_right_button_layout(new Layout(X0, Y0, X1, TabHeightFromFont(font), 1, 3)),
     m_text_color(text_color),
     m_style(style),
     m_first_tab_shown(0)

Modified: trunk/FreeOrion/UI/CUIControls.cpp
===================================================================
--- trunk/FreeOrion/UI/CUIControls.cpp	2014-08-29 11:51:39 UTC (rev 7666)
+++ trunk/FreeOrion/UI/CUIControls.cpp	2014-08-29 11:51:58 UTC (rev 7667)
@@ -449,7 +449,7 @@
 ///////////////////////////////////////
 CUITabBar::CUITabBar(const boost::shared_ptr<GG::Font>& font, GG::Clr color, GG::Clr text_color,
                      GG::TabBarStyle style) :
-    GG::TabBar(GG::X0, GG::Y0, GG::X1, font, color, text_color, style)
+    GG::TabBar(font, color, text_color, style)
 {}
 
 void CUITabBar::DistinguishCurrentTab(const std::vector<GG::StateButton*>& tab_buttons) {