diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
| commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
| tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/gui/login.h | |
| parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
| parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
| download | mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip | |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/gui/login.h')
| -rw-r--r-- | src/gui/login.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gui/login.h b/src/gui/login.h index b7abbb2a..c0d6e755 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -22,21 +22,18 @@ #ifndef LOGIN_H #define LOGIN_H -#include <iosfwd> #include <string> #include <vector> #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> +#include <guichan/listmodel.hpp> -#include "scrollarea.h" #include "window.h" -#include "widgets/dropdown.h" - -#include "../guichanfwd.h" - +class DropDown; class LoginData; +class ScrollArea; /** * The login dialog. @@ -132,7 +129,7 @@ class LoginDialog : public Window, public gcn::ActionListener, }; DropDownList *mServerList; gcn::ListBox *mServerListBox; - ScrollArea *mServerScrollArea; + gcn::ScrollArea *mServerScrollArea; }; #endif |