diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-07-05 00:52:39 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-11 02:39:48 +0200 |
| commit | 2de4411e9b2b81986f4b9e7c645894e59842590e (patch) | |
| tree | 6b67b700991efa739abea72a08c813770405e0e2 /src/gui/windowmenu.h | |
| parent | 7115ac62eb2069d378d67758a3cd221e6620975d (diff) | |
| download | mana-client-2de4411e9b2b81986f4b9e7c645894e59842590e.tar.gz mana-client-2de4411e9b2b81986f4b9e7c645894e59842590e.tar.bz2 mana-client-2de4411e9b2b81986f4b9e7c645894e59842590e.tar.xz mana-client-2de4411e9b2b81986f4b9e7c645894e59842590e.zip | |
Changed the Social button to an image one.
I also made the client able to keep the old behaviour,
and i changed the button api to not require the icon frames size
as it could easily guess them.
Diffstat (limited to 'src/gui/windowmenu.h')
| -rw-r--r-- | src/gui/windowmenu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index 2bb3e764..b4b0446d 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -48,7 +48,8 @@ class WindowMenu : public Container, void valueChanged(const gcn::SelectionEvent &event); private: - inline void addButton(const char* text, int &x, int &h); + inline void addButton(const std::string& text, int &x, int &h, + const std::string& iconPath = std::string()); EmotePopup *mEmotePopup; }; |