X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/254a21292b0ccf234ed1dbc6acd37708672ffcc0..cf126cf22bcb9209893f629602984ec28459af51:/demos/forty/playerdg.cpp

diff --git a/demos/forty/playerdg.cpp b/demos/forty/playerdg.cpp
index e5b5ee8267..330e84eef4 100644
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -4,16 +4,10 @@
 // Author:      Chris Breeze
 // Modified by:
 // Created:     21/07/97
-// RCS-ID:      $Id$
 // Copyright:   (c) 1993-1998 Chris Breeze
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -42,14 +36,14 @@ PlayerSelectionDialog::PlayerSelectionDialog(
                             wxWindow* parent,
                             ScoreFile* file
                             ) :
-    wxDialog(parent, wxID_ANY, _T("Player Selection"), wxDefaultPosition),
+    wxDialog(parent, wxID_ANY, wxT("Player Selection"), wxDefaultPosition),
     m_scoreFile(file)
 {
-    wxStaticText* msg = new wxStaticText(this, wxID_ANY, _T("Please select a name or type a new one:"));
+    wxStaticText* msg = new wxStaticText(this, wxID_ANY, wxT("Please select a name or type a new one:"));
 
     wxListBox* list = new wxListBox(
                         this, ID_LISTBOX,
-                        wxDefaultPosition, wxDefaultSize,
+                        wxDefaultPosition, wxSize(-1, 150),
                         0, 0,
                         wxLB_SINGLE
                         );
@@ -63,8 +57,8 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 
     m_textField = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize);
 
-    m_OK = new wxButton(this, wxID_OK, _T("OK"));
-    m_cancel = new wxButton(this, wxID_CANCEL, _T("Cancel"));
+    m_OK = new wxButton(this, wxID_OK);
+    m_cancel = new wxButton(this, wxID_CANCEL);
 
     wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
     button_sizer->Add( m_OK, 0, wxALL, 10 );
@@ -81,6 +75,8 @@ PlayerSelectionDialog::PlayerSelectionDialog(
     topsizer->SetSizeHints( this );
 
     CentreOnParent();
+
+    m_OK->SetDefault();
 }
 
 void PlayerSelectionDialog::OnSize(wxSizeEvent& WXUNUSED(event))
@@ -105,7 +101,7 @@ void PlayerSelectionDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 void PlayerSelectionDialog::SelectCallback(wxCommandEvent& event)
 {
-    if (event.GetEventType() == wxEVT_COMMAND_LISTBOX_SELECTED)
+    if (event.GetEventType() == wxEVT_LISTBOX)
     {
 //        if (event.IsSelection())
         m_textField->SetValue(event.GetString());
@@ -117,11 +113,11 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
     if (event.GetId() == wxID_OK)
     {
         wxString name = m_textField->GetValue();
-        if (!name.IsNull() && name.Length() > 0)
+        if ( !name.empty() )
         {
-            if (name.Contains(_T('@')))
+            if (name.Contains(wxT('@')))
             {
-                wxMessageBox(_T("Names should not contain the '@' character"), _T("Forty Thieves"));
+                wxMessageBox(wxT("Names should not contain the '@' character"), wxT("Forty Thieves"));
             }
             else
             {
@@ -131,7 +127,7 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
         }
         else
         {
-             wxMessageBox(_T("Please enter your name"), _T("Forty Thieves"));
+             wxMessageBox(wxT("Please enter your name"), wxT("Forty Thieves"));
         }
     }
     else