X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70d26c3f4ffb24d50457d405c9595fd23f9e5b7c..8e0ecdd955941a360c65a9f375587a81b0695d38:/demos/forty/playerdg.cpp

diff --git a/demos/forty/playerdg.cpp b/demos/forty/playerdg.cpp
index fa3ea03d04..1daa8905dd 100644
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -44,15 +44,12 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 							wxWindow* parent,
 							ScoreFile* file
 							) :
-	wxDialog(parent, -1, "Player Selection",
-			wxDefaultPosition, wxSize(320, 200),
+	wxDialog(parent, wxID_ANY, _T("Player Selection"),
+			wxDefaultPosition, wxDefaultSize,
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
 {
-	// enable constraints
-	SetAutoLayout (TRUE);
-
-	wxStaticText* msg = new wxStaticText(this, -1, "Please select a name from the list");
+	wxStaticText* msg = new wxStaticText(this, wxID_ANY, _T("Please select a name or type a new one:"));
 
 	wxListBox* list = new wxListBox(
 						this, ID_LISTBOX,
@@ -68,61 +65,26 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 		list->Append(players[i]);
 	}
 
-	m_textField = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, 0);
-
-	m_OK = new wxButton(this, wxID_OK, "OK");
-	m_cancel = new wxButton(this, wxID_CANCEL, "Cancel");
-
-	wxLayoutConstraints* layout;
-
-	// Constrain the msg at the top of the window
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->top.SameAs		(this,	wxTop,	10);
-	layout->height.AsIs();
-	layout->width.AsIs();
-	msg->SetConstraints(layout);
-
-	// Constrain the OK button
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->bottom.SameAs	(this,	 wxBottom,	10);
-	layout->height.AsIs();
-	layout->width.AsIs();
-	m_OK->SetConstraints(layout);
-
-	// Constrain the OK button
-	layout = new wxLayoutConstraints;
-	layout->left.RightOf	(m_OK,	10);
-	layout->bottom.SameAs	(this,	wxBottom,	10);
-	layout->height.AsIs();
-	layout->width.AsIs();
-	m_cancel->SetConstraints(layout);
-
-	// Constrain the Name text entry field
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->right.SameAs	(this,	wxRight,	10);
-	layout->bottom.SameAs	(m_OK,	wxTop,		10);
-	layout->height.AsIs();
-	m_textField->SetConstraints(layout);
-
-	// Constrain the list of players
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->right.SameAs	(this,	wxRight,	10);
-	layout->top.Below		(msg,	10);
-	layout->bottom.SameAs	(m_textField,	wxTop,	10);
-	list->SetConstraints(layout);
-
-	wxString prevPlayer = m_scoreFile->GetPreviousPlayer();
-	if (prevPlayer.Length() > 0)
-	{
-		list->SetStringSelection(prevPlayer);
-		m_textField->SetValue(prevPlayer);
-	}
+	m_textField = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, 0);
 
-	Layout();
+	m_OK = new wxButton(this, wxID_OK, _T("OK"));
+	m_cancel = new wxButton(this, wxID_CANCEL, _T("Cancel"));
+
+  wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
+  button_sizer->Add( m_OK, 0, wxALL, 10 );
+  button_sizer->Add( m_cancel, 0, wxALL, 10 );
+
+  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+  topsizer->Add( msg, 0, wxALL , 10 );
+  topsizer->Add( list, 1, wxEXPAND | wxLEFT | wxRIGHT, 10 );
+  topsizer->Add( m_textField, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, 10 );
+  topsizer->Add( button_sizer, 0, wxALIGN_LEFT );
+
+  SetSizer( topsizer );
+
+  topsizer->SetSizeHints( this );
+    
+    CentreOnParent();
 }
 
 PlayerSelectionDialog::~PlayerSelectionDialog()
@@ -138,14 +100,14 @@ const wxString& PlayerSelectionDialog::GetPlayersName()
 {
 /*
 	m_player = "";
-	Show(TRUE);
+	Show(true);
 */
 	return m_player;
 }
 
-void PlayerSelectionDialog::OnCloseWindow(wxCloseEvent& event)
+void PlayerSelectionDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
-	m_player = "";
+	m_player = _T("");
     EndModal(wxID_CANCEL);
 }
 
@@ -165,9 +127,9 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
 		wxString name = m_textField->GetValue();
 		if (!name.IsNull() && name.Length() > 0)
 		{
-			if (name.Contains('@'))
+			if (name.Contains(_T('@')))
 			{
-				wxMessageBox("Names should not contain the '@' character", "Forty Thieves");
+				wxMessageBox(_T("Names should not contain the '@' character"), _T("Forty Thieves"));
 			}
 			else
 			{
@@ -177,12 +139,12 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
 		}
 		else
 		{
- 			wxMessageBox("Please enter your name", "Forty Thieves");
+ 			wxMessageBox(_T("Please enter your name"), _T("Forty Thieves"));
 		}
 	}
 	else
 	{
-		m_player = "";
+		m_player = _T("");
 		EndModal(wxID_CANCEL);
 	}
 }