Removed sex choice.

4 files changed, 7 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 45cd2a9a..1648f018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	src/net/charserverhandler.cpp, src/net/loginhandler.cpp,
 	src/net/protocol.h: Ported account registration to tmwserv. There's
 	still a disconnection/reconnection between registration and login.
+	* src/gui/gui.cpp, src/register.cpp, src/register.h: Removed sex
+	choice.
 
 2006-08-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 1638f94e..88998f7a 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -27,6 +27,9 @@
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
 
+
+// Moved up because of nested inclusion of winnt.h which defines DELETE
+// constant as well as guichan does
 #include <guichan/sdl/sdlinput.hpp>
 
 #ifdef USE_OPENGL
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 82e5f716..49da10b6 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -57,13 +57,11 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     mConfirmField = new PasswordField();
     mEmailField = new TextField();
     mServerField = new TextField();
-    mMaleButton = new RadioButton("Male", "sex", true);
-    mFemaleButton = new RadioButton("Female", "sex", false);
     mRegisterButton = new Button("Register", "register", this);
     mCancelButton = new Button("Cancel", "cancel", this);
 
     int width = 200;
-    int height = 170;
+    int height = 150;
     setContentSize(width, height);
 
     mUserField->setPosition(65, 5);
@@ -78,7 +76,7 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
             65, mConfirmField->getY() + mConfirmField->getHeight() + 7);
     mEmailField->setWidth(130);
     mServerField->setPosition(
-            65, 23 + mEmailField->getY() + mEmailField->getHeight() + 7);
+            65, 8 + mEmailField->getY() + mEmailField->getHeight() + 7);
     mServerField->setWidth(130);
 
     userLabel->setPosition(5, mUserField->getY() + 1);
@@ -87,11 +85,6 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     emailLabel->setPosition(5, mEmailField->getY() + 1);
     serverLabel->setPosition(5, mServerField->getY() + 1);
 
-    mFemaleButton->setPosition(width - mFemaleButton->getWidth() - 10,
-            mEmailField->getY() + mEmailField->getHeight() + 7);
-    mMaleButton->setPosition(mFemaleButton->getX() - mMaleButton->getWidth() - 5,
-            mFemaleButton->getY());
-
     mRegisterButton->setPosition(5, height - mRegisterButton->getHeight() - 5);
     mCancelButton->setPosition(10 + mRegisterButton->getWidth(),
             mRegisterButton->getY());
@@ -106,8 +99,6 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     add(mConfirmField);
     add(mEmailField);
     add(mServerField);
-    add(mMaleButton);
-    add(mFemaleButton);
     add(mRegisterButton);
     add(mCancelButton);
 
diff --git a/src/gui/register.h b/src/gui/register.h
index 30dacd3e..72a32bb0 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -70,8 +70,6 @@ class RegisterDialog : public Window, public gcn::ActionListener {
 
         gcn::Button *mRegisterButton;
         gcn::Button *mCancelButton;
-        gcn::RadioButton *mMaleButton;
-        gcn::RadioButton *mFemaleButton;
 
         WrongDataNoticeListener *mWrongDataNoticeListener;
         OkDialog *mWrongRegisterNotice;