Fixed bug in MDI
Changed FortyThieves to 2.0 dialog logic Did I modify dialog.cpp as well? git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d355d3fe69
commit
7b5408ea7d
@ -99,6 +99,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
|
||||
if (m_player.Length() == 0 && !m_playerDialog)
|
||||
{
|
||||
m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
|
||||
m_playerDialog->ShowModal();
|
||||
m_player = m_playerDialog->GetPlayersName();
|
||||
if (m_player.Length() > 0)
|
||||
{
|
||||
|
@ -59,6 +59,9 @@ PlayerSelectionDialog::PlayerSelectionDialog(
|
||||
0, 0,
|
||||
wxLB_SINGLE
|
||||
);
|
||||
/*
|
||||
Robert Roebling
|
||||
|
||||
int numPlayers = 0;
|
||||
wxString* players = 0;
|
||||
m_scoreFile->GetPlayerList(&players, numPlayers);
|
||||
@ -67,6 +70,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
|
||||
list->Append(players[i]);
|
||||
}
|
||||
delete players;
|
||||
*/
|
||||
|
||||
m_textField = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, 0);
|
||||
|
||||
@ -136,8 +140,10 @@ void PlayerSelectionDialog::OnSize(wxSizeEvent& event)
|
||||
|
||||
const wxString& PlayerSelectionDialog::GetPlayersName()
|
||||
{
|
||||
/*
|
||||
m_player = "";
|
||||
Show(TRUE);
|
||||
*/
|
||||
return m_player;
|
||||
}
|
||||
|
||||
|
@ -372,6 +372,8 @@ void wxMDIClientWindow::AddChild( wxWindow *child )
|
||||
mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
|
||||
|
||||
gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
|
||||
|
||||
gtk_page_change_callback( NULL, mdi_child->m_page, 0, this );
|
||||
};
|
||||
|
||||
|
||||
|
@ -372,6 +372,8 @@ void wxMDIClientWindow::AddChild( wxWindow *child )
|
||||
mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
|
||||
|
||||
gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
|
||||
|
||||
gtk_page_change_callback( NULL, mdi_child->m_page, 0, this );
|
||||
};
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user