switching to native focus handling

[wxWidgets.git] / demos / forty / playerdg.cpp

diff --git a/demos/forty/playerdg.cpp b/demos/forty/playerdg.cpp
index 674758143b9697be9130980cca731b6a39502adb..1daa8905ddf062964de47b3b8f8366901628e7dc 100644 (file)
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -44,15 +44,12 @@ PlayerSelectionDialog::PlayerSelectionDialog(
                                                        wxWindow* parent,
                                                        ScoreFile* file
                                                        ) :
                                                        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)
 {
                        wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
        m_scoreFile(file)
 {

-       // enable constraints
-       SetAutoLayout (TRUE);
-
-       wxStaticText* msg = new wxStaticText(this, -1, "Please select a name or type a new one:");
+       wxStaticText* msg = new wxStaticText(this, wxID_ANY, _T("Please select a name or type a new one:"));

 
        wxListBox* list = new wxListBox(
                                                this, ID_LISTBOX,
 
        wxListBox* list = new wxListBox(
                                                this, ID_LISTBOX,


@@ -68,63 +65,24 @@ PlayerSelectionDialog::PlayerSelectionDialog(
                list->Append(players[i]);
        }
 
                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->FindString(prevPlayer) != -1))
-       {
-               list->SetStringSelection(prevPlayer);
-               m_textField->SetValue(prevPlayer);
-       }
+       m_textField = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, 0);

 
 

-    m_textField->SetFocus();
+       m_OK = new wxButton(this, wxID_OK, _T("OK"));
+       m_cancel = new wxButton(this, wxID_CANCEL, _T("Cancel"));

 
 

-       Layout();
+  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();
 }
     
     CentreOnParent();
 }


@@ -142,14 +100,14 @@ const wxString& PlayerSelectionDialog::GetPlayersName()
 {
 /*
        m_player = "";
 {
 /*
        m_player = "";

-       Show(TRUE);
+       Show(true);

 */
        return m_player;
 }
 
 */
        return m_player;
 }
 

-void PlayerSelectionDialog::OnCloseWindow(wxCloseEvent& event)
+void PlayerSelectionDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
 {

-       m_player = "";
+       m_player = _T("");

     EndModal(wxID_CANCEL);
 }
 
     EndModal(wxID_CANCEL);
 }
 


@@ -169,9 +127,9 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
                wxString name = m_textField->GetValue();
                if (!name.IsNull() && name.Length() > 0)
                {
                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
                        {
                        }
                        else
                        {


@@ -181,12 +139,12 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
                }
                else
                {
                }
                else
                {

-                       wxMessageBox("Please enter your name", "Forty Thieves");
+                       wxMessageBox(_T("Please enter your name"), _T("Forty Thieves"));

                }
        }
        else
        {
                }
        }
        else
        {

-               m_player = "";
+               m_player = _T("");

                EndModal(wxID_CANCEL);
        }
 }
                EndModal(wxID_CANCEL);
        }
 }