From 7b5408ea7dbc55e064ad0343316245d15752710c Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 28 Jul 1998 07:50:45 +0000 Subject: [PATCH] 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 --- samples/forty/canvas.cpp | 1 + samples/forty/playerdg.cpp | 6 ++++++ src/gtk/mdi.cpp | 2 ++ src/gtk1/mdi.cpp | 2 ++ 4 files changed, 11 insertions(+) diff --git a/samples/forty/canvas.cpp b/samples/forty/canvas.cpp index a6d1137ee7..acaf9a548f 100644 --- a/samples/forty/canvas.cpp +++ b/samples/forty/canvas.cpp @@ -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) { diff --git a/samples/forty/playerdg.cpp b/samples/forty/playerdg.cpp index 38160488da..aa671d0adc 100644 --- a/samples/forty/playerdg.cpp +++ b/samples/forty/playerdg.cpp @@ -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; } diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index 4428a9edad..ba49975d89 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -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 ); }; diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 4428a9edad..ba49975d89 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -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 ); }; -- 2.47.2