0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/SDL_Colour/SDL_Color/

Browse source
This commit is contained in:
Cédric Duval 2004-11-02 00:11:36 +00:00
parent 0be30c9279
commit 32dffd8c99
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/widgets/label.cpp
View file

@ -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 @@ int label::get_size() const
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_;
}

8
src/widgets/label.hpp
View file

@ -24,15 +24,15 @@ class label : public widget
{
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 @@ private:
std::string text_;
int size_;
SDL_Colour colour_;
SDL_Color colour_;
};
}