diff options
author | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
commit | f030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch) | |
tree | cd92baf9e4fa8a136523b9eb570e9811846c9250 /src/ui/bitmap.h | |
parent | 5636fad174f0bcff857c357c394c4cc8d424b302 (diff) |
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/ui/bitmap.h')
-rw-r--r-- | src/ui/bitmap.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ui/bitmap.h b/src/ui/bitmap.h index 9bc1776..4838ea2 100644 --- a/src/ui/bitmap.h +++ b/src/ui/bitmap.h @@ -15,29 +15,29 @@ namespace ui class Bitmap : public Widget { public: - Bitmap(Widget *parent, const char *texture=0); + Bitmap(Widget *parent, const char *texture = 0); ~Bitmap(); - + inline std::string const &texture() const { return bitmap_texture; } - + inline math::Color const &color() const { return bitmap_color; } - + void set_texture(const std::string & texture); void set_texture(const char *texture); - + void set_color(const math::Color &color); - + /// print bitmap description virtual void print(const size_t indent) const; - + protected: /// draw the bitmap as background virtual void draw_background(); - + private: std::string bitmap_texture; math::Color bitmap_color; |