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

Fixed property list OnClose problem that caused Dialog Editor problem

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-09 18:19:15 +00:00
parent da3aea64f9
commit 3b1e466ce9
6 changed files with 159 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/generic/proplist.cpp
View File

@@ -1713,7 +1713,7 @@ class wxPropertyStringListEditorDialog: public wxDialog
m_currentSelection = -1;
}
~wxPropertyStringListEditorDialog(void) {}
bool OnClose(void);
void OnCloseWindow(wxCloseEvent& event);
void SaveCurrentSelection(void);
void ShowCurrentSelection(void);
@@ -1745,6 +1745,7 @@ BEGIN_EVENT_TABLE(wxPropertyStringListEditorDialog, wxDialog)
EVT_BUTTON(wxID_PROP_SL_DELETE, wxPropertyStringListEditorDialog::OnDelete)
EVT_LISTBOX(wxID_PROP_SL_STRINGS, wxPropertyStringListEditorDialog::OnStrings)
EVT_TEXT_ENTER(wxID_PROP_SL_TEXT, wxPropertyStringListEditorDialog::OnText)
EVT_CLOSE(wxPropertyStringListEditorDialog::OnCloseWindow)
END_EVENT_TABLE()
class wxPropertyStringListEditorText: public wxTextCtrl
@@ -1905,14 +1906,16 @@ void wxPropertyStringListEditorDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{
SaveCurrentSelection();
EndModal(wxID_OK);
Close(TRUE);
// Close(TRUE);
this->Destroy();
}
void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{
sm_dialogCancelled = TRUE;
EndModal(wxID_CANCEL);
Close(TRUE);
// Close(TRUE);
this->Destroy();
}
void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
@@ -1923,10 +1926,10 @@ void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
}
}
bool wxPropertyStringListEditorDialog::OnClose(void)
void wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& event)
{
SaveCurrentSelection();
return TRUE;
this->Destroy();
}
void wxPropertyStringListEditorDialog::SaveCurrentSelection(void)