Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug in MDI

Browse Source 
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:
Robert Roebling
1998-07-28 07:50:45 +00:00
parent d355d3fe69
commit 7b5408ea7d
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/forty/canvas.cpp
View File

@@ -99,6 +99,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
if (m_player.Length() == 0 && !m_playerDialog) if (m_player.Length() == 0 && !m_playerDialog)
{ {
m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile); m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
m_playerDialog->ShowModal();
m_player = m_playerDialog->GetPlayersName(); m_player = m_playerDialog->GetPlayersName();
if (m_player.Length() > 0) if (m_player.Length() > 0)
{ {

6
samples/forty/playerdg.cpp
View File

@@ -59,6 +59,9 @@ PlayerSelectionDialog::PlayerSelectionDialog(
0, 0, 0, 0,
wxLB_SINGLE wxLB_SINGLE
); );
/*
Robert Roebling
int numPlayers = 0; int numPlayers = 0;
wxString* players = 0; wxString* players = 0;
m_scoreFile->GetPlayerList(&players, numPlayers); m_scoreFile->GetPlayerList(&players, numPlayers);
@@ -67,6 +70,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
list->Append(players[i]); list->Append(players[i]);
} }
delete players; delete players;
*/
m_textField = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, 0); m_textField = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, 0);
@@ -136,8 +140,10 @@ void PlayerSelectionDialog::OnSize(wxSizeEvent& event)
const wxString& PlayerSelectionDialog::GetPlayersName() const wxString& PlayerSelectionDialog::GetPlayersName()
{ {
/*
m_player = ""; m_player = "";
Show(TRUE); Show(TRUE);
*/
return m_player; return m_player;
} }

2
src/gtk/mdi.cpp
View File

@@ -372,6 +372,8 @@ void wxMDIClientWindow::AddChild( wxWindow *child )
mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data); 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_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
gtk_page_change_callback( NULL, mdi_child->m_page, 0, this );
}; };

2
src/gtk1/mdi.cpp
View File

@@ -372,6 +372,8 @@ void wxMDIClientWindow::AddChild( wxWindow *child )
mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data); 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_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
gtk_page_change_callback( NULL, mdi_child->m_page, 0, this );
}; };