[Wesnoth-cvs-commits] wesnoth/src/widgets label.cpp label.hpp

[Cedric Duval]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Cedric Duval <address@hidden>   04/11/02 00:11:36

Modified files:
        src/widgets    : label.cpp label.hpp 

Log message:
        s/SDL_Colour/SDL_Color/

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/label.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/label.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/src/widgets/label.cpp
diff -u wesnoth/src/widgets/label.cpp:1.1 wesnoth/src/widgets/label.cpp:1.2
--- wesnoth/src/widgets/label.cpp:1.1   Mon Nov  1 18:06:37 2004
+++ wesnoth/src/widgets/label.cpp       Tue Nov  2 00:11:36 2004
@@ -1,4 +1,4 @@
-/* $Id: label.cpp,v 1.1 2004/11/01 18:06:37 gruikya Exp $ */
+/* $Id: label.cpp,v 1.2 2004/11/02 00:11:36 cedricd Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -16,7 +16,7 @@
 
 namespace gui {
 
-label::label(display& d, const std::string& text, int size, const SDL_Colour& 
colour) : widget(d), text_(text), size_(size), colour_(colour)
+label::label(display& d, const std::string& text, int size, const SDL_Color& 
colour) : widget(d), text_(text), size_(size), colour_(colour)
 {
        update_label_size();
 }
@@ -50,14 +50,14 @@
        return size_;
 }
 
-const SDL_Colour& label::set_colour(const SDL_Colour& colour)
+const SDL_Color& label::set_colour(const SDL_Color& colour)
 {
        colour_ = colour;
        set_dirty();
        return colour_;
 }
 
-const SDL_Colour& label::get_colour() const
+const SDL_Color& label::get_colour() const
 {
        return colour_;
 }
Index: wesnoth/src/widgets/label.hpp
diff -u wesnoth/src/widgets/label.hpp:1.1 wesnoth/src/widgets/label.hpp:1.2
--- wesnoth/src/widgets/label.hpp:1.1   Mon Nov  1 18:06:37 2004
+++ wesnoth/src/widgets/label.hpp       Tue Nov  2 00:11:36 2004
@@ -1,4 +1,4 @@
-/* $Id: label.hpp,v 1.1 2004/11/01 18:06:37 gruikya Exp $ */
+/* $Id: label.hpp,v 1.2 2004/11/02 00:11:36 cedricd Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -24,15 +24,15 @@
 {
 public:
        label(display& d, const std::string& text, int size=font::SIZE_NORMAL, 
-                       const SDL_Colour& colour=font::NORMAL_COLOUR);
+                       const SDL_Color& colour=font::NORMAL_COLOUR);
        const std::string& set_text(const std::string& text);
        const std::string& get_text() const;
 
        int set_size(int size);
        int get_size() const;
 
-       const SDL_Colour& set_colour(const SDL_Colour& colour);
-       const SDL_Colour& get_colour() const;
+       const SDL_Color& set_colour(const SDL_Color& colour);
+       const SDL_Color& get_colour() const;
 
        virtual void draw_contents();
        virtual void set_location(const SDL_Rect& rect);
@@ -43,7 +43,7 @@
 
        std::string text_;
        int size_;
-       SDL_Colour colour_;
+       SDL_Color colour_;
 };
 
 }