diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-04-12 09:58:33 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-04-12 09:58:33 -0600 |
commit | fbbd2edd6f33628b6e9257cf876670759f454017 (patch) | |
tree | bd9bdb358c5970786efa9f78df938170f35bd685 /src/gui/widgets/desktop.h | |
parent | e41371d866d403260f713a06c877d24eb43ad7b3 (diff) | |
download | mana-client-fbbd2edd6f33628b6e9257cf876670759f454017.tar.gz mana-client-fbbd2edd6f33628b6e9257cf876670759f454017.tar.bz2 mana-client-fbbd2edd6f33628b6e9257cf876670759f454017.tar.xz mana-client-fbbd2edd6f33628b6e9257cf876670759f454017.zip |
Merge version strings, add version to setup, etc
All instances of version strings should now use the same text. The
version label was moved from main.cpp to Desktop. A new version label
was added to SetupDialog to make it easier to get the version if you are
already in game.
Diffstat (limited to 'src/gui/widgets/desktop.h')
-rw-r--r-- | src/gui/widgets/desktop.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index ed68145a..7eabde54 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -22,10 +22,11 @@ #ifndef DESKTOP_H #define DESKTOP_H -#include <guichan/widget.hpp> +#include <guichan/widgets/container.hpp> #include <guichan/widgetlistener.hpp> class Image; +class Label; /** * Desktop widget, for drawing a background image and color. @@ -38,7 +39,7 @@ class Image; * * \ingroup GUI */ -class Desktop : public gcn::Widget, gcn::WidgetListener +class Desktop : public gcn::Container, gcn::WidgetListener { public: Desktop(); @@ -57,6 +58,7 @@ class Desktop : public gcn::Widget, gcn::WidgetListener void setBestFittingWallpaper(); Image *mWallpaper; + Label *versionLabel; }; #endif // DESKTOP_H |