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

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

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

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

Modified: trunk/FreeOrion/GG/GG/Scroll.h
===================================================================
--- trunk/FreeOrion/GG/GG/Scroll.h	2014-08-29 11:51:58 UTC (rev 7667)
+++ trunk/FreeOrion/GG/GG/Scroll.h	2014-08-29 11:52:18 UTC (rev 7668)
@@ -76,7 +76,7 @@
 
     /** \name Structors */ ///@{
     /** Ctor. */
-    Scroll(X x, Y y, X w, Y h, Orientation orientation, Clr color, Clr interior);
+    Scroll(Orientation orientation, Clr color, Clr interior);
     //@}
 
     /** \name Accessors */ ///@{

Modified: trunk/FreeOrion/GG/src/Scroll.cpp
===================================================================
--- trunk/FreeOrion/GG/src/Scroll.cpp	2014-08-29 11:51:58 UTC (rev 7667)
+++ trunk/FreeOrion/GG/src/Scroll.cpp	2014-08-29 11:52:18 UTC (rev 7668)
@@ -52,8 +52,8 @@
 ////////////////////////////////////////////////
 // GG::Scroll
 ////////////////////////////////////////////////
-Scroll::Scroll(X x, Y y, X w, Y h, Orientation orientation, Clr color, Clr interior) :
-    Control(x, y, w, h, INTERACTIVE | REPEAT_BUTTON_DOWN),
+Scroll::Scroll(Orientation orientation, Clr color, Clr interior) :
+    Control(X0, Y0, X1, Y1, INTERACTIVE | REPEAT_BUTTON_DOWN),
     m_int_color(interior),
     m_orientation(orientation),
     m_posn(0),

Modified: trunk/FreeOrion/GG/src/StyleFactory.cpp
===================================================================
--- trunk/FreeOrion/GG/src/StyleFactory.cpp	2014-08-29 11:51:58 UTC (rev 7667)
+++ trunk/FreeOrion/GG/src/StyleFactory.cpp	2014-08-29 11:52:18 UTC (rev 7668)
@@ -96,7 +96,7 @@
 { return new ListBox(color, interior); }
 
 Scroll* StyleFactory::NewScroll(Orientation orientation, Clr color, Clr interior) const
-{ return new Scroll(X0, Y0, X1, Y1, orientation, color, interior); }
+{ return new Scroll(orientation, color, interior); }
 
 Slider<int>* StyleFactory::NewIntSlider(int min, int max, Orientation orientation,
                                         SliderLineStyle style, Clr color, int tab_width, int line_width/* = 5*/) const

Modified: trunk/FreeOrion/UI/CUIControls.cpp
===================================================================
--- trunk/FreeOrion/UI/CUIControls.cpp	2014-08-29 11:51:58 UTC (rev 7667)
+++ trunk/FreeOrion/UI/CUIControls.cpp	2014-08-29 11:52:18 UTC (rev 7668)
@@ -582,7 +582,7 @@
 // class CUIScroll
 ///////////////////////////////////////
 CUIScroll::CUIScroll(GG::Orientation orientation) :
-    Scroll(GG::X0, GG::Y0, GG::X1, GG::Y1, orientation, ClientUI::CtrlColor(), ClientUI::CtrlColor()),
+    Scroll(orientation, ClientUI::CtrlColor(), ClientUI::CtrlColor()),
     m_border_color(ClientUI::CtrlBorderColor())
 {}