summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2009-05-18 17:19:43 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-18 19:11:30 +0200
commit64dade048df384289965157c81fb10c3eacef582 (patch)
treefae8e93334f3f9d149fb54c4256cab0da9924c6b /src/gui
parent7b2b5dabb44ce1448f3af99fcba96eefe6d9147d (diff)
downloadmana-client-64dade048df384289965157c81fb10c3eacef582.tar.gz
mana-client-64dade048df384289965157c81fb10c3eacef582.tar.bz2
mana-client-64dade048df384289965157c81fb10c3eacef582.tar.xz
mana-client-64dade048df384289965157c81fb10c3eacef582.zip
Fixed compilation for tmwserv
(cherry picked from commit e7df8c9dd7ebc14c1263c19c6a238ebcf4fd9465)
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/connection.cpp2
-rw-r--r--src/gui/connection.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 0862ee69..4863edcd 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -30,7 +30,7 @@
#include "utils/gettext.h"
-ConnectionDialog::ConnectionDialog(int previousState):
+ConnectionDialog::ConnectionDialog(State previousState):
Window("Info"), mProgress(0), mPreviousState(previousState)
{
setContentSize(200, 100);
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 62441fa9..d6059c3f 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -24,6 +24,8 @@
#include "gui/widgets/window.h"
+#include "main.h"
+
#include <guichan/actionlistener.hpp>
class ProgressBar;
@@ -41,7 +43,7 @@ class ConnectionDialog : public Window, gcn::ActionListener
*
* @see Window::Window
*/
- ConnectionDialog(int previousState);
+ ConnectionDialog(State previousState);
/**
* Called when the user presses Cancel. Restores the global state to
@@ -54,7 +56,7 @@ class ConnectionDialog : public Window, gcn::ActionListener
private:
ProgressBar *mProgressBar;
float mProgress;
- int mPreviousState;
+ State mPreviousState;
};
#endif