wxArrayStringProperty::m_delimiter default value was missing. Also cleaned up relevan...

[wxWidgets.git] / samples / dialogs / dialogs.cpp

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 941ce02b028c9137d588fff4588ccc2b70f522d6..1d15d8084817d869a5822b0149237126f1fd117e 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) Julian Smart
 //              (c) 2004 ABX
 //              (c) Vadim Zeitlin
 // Copyright:   (c) Julian Smart
 //              (c) 2004 ABX
 //              (c) Vadim Zeitlin

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -1949,8 +1949,7 @@ void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_dlgReplace )
     {
 {
     if ( m_dlgReplace )
     {

-        delete m_dlgReplace;
-        m_dlgReplace = NULL;
+        wxDELETE(m_dlgReplace);

     }
     else
     {
     }
     else
     {


@@ -1970,8 +1969,7 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_dlgFind )
     {
 {
     if ( m_dlgFind )
     {

-        delete m_dlgFind;
-        m_dlgFind = NULL;
+        wxDELETE(m_dlgFind);

     }
     else
     {
     }
     else
     {


@@ -2147,9 +2145,7 @@ void MyModalDialog::OnButton(wxCommandEvent& event)
 {
     if ( event.GetEventObject() == m_btnDelete )
     {
 {
     if ( event.GetEventObject() == m_btnDelete )
     {

-        delete m_btnModal;
-        m_btnModal = NULL;
-
+        wxDELETE(m_btnModal);

         m_btnDelete->Disable();
     }
     else if ( event.GetEventObject() == m_btnModal )
         m_btnDelete->Disable();
     }
     else if ( event.GetEventObject() == m_btnModal )