X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68376d9326e23dae34ce0d28fb3482b0411afd7..c6aabd1ca9a5590d5dd8e89d83a5fba74c69c931:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index d151f571ef..6be65d3237 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -496,7 +496,7 @@ bool MyApp::OnInit() MyFrame::MyFrame(const wxString& title) : wxFrame(NULL, wxID_ANY, title) { - SetIcon(sample_xpm); + SetIcon(wxICON(sample)); #if USE_MODAL_PRESENTATION m_dialog = (MyModelessDialog *)NULL; @@ -1949,8 +1949,7 @@ void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) ) { if ( m_dlgReplace ) { - delete m_dlgReplace; - m_dlgReplace = NULL; + wxDELETE(m_dlgReplace); } else { @@ -1970,8 +1969,7 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) ) { if ( m_dlgFind ) { - delete m_dlgFind; - m_dlgFind = NULL; + wxDELETE(m_dlgFind); } else { @@ -2147,9 +2145,7 @@ void MyModalDialog::OnButton(wxCommandEvent& event) { if ( event.GetEventObject() == m_btnDelete ) { - delete m_btnModal; - m_btnModal = NULL; - + wxDELETE(m_btnModal); m_btnDelete->Disable(); } else if ( event.GetEventObject() == m_btnModal )