diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-08-02 10:23:25 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-08-02 10:23:25 +0000 |
| commit | 2f55e567a965bd315f191b51986038b2daf45525 (patch) | |
| tree | 90d4dfee30c86c84f1af226f05439062a48e1e80 /src | |
| parent | 25fe73f89756cb4102f97bcccdb8635a6a56f35d (diff) | |
| download | mana-2f55e567a965bd315f191b51986038b2daf45525.tar.gz mana-2f55e567a965bd315f191b51986038b2daf45525.tar.bz2 mana-2f55e567a965bd315f191b51986038b2daf45525.tar.xz mana-2f55e567a965bd315f191b51986038b2daf45525.zip | |
Removed sex choice.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/gui.cpp | 3 | ||||
| -rw-r--r-- | src/gui/register.cpp | 13 | ||||
| -rw-r--r-- | src/gui/register.h | 2 |
3 files changed, 5 insertions, 13 deletions
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; |