X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..0d1903dbda864780eec30efdc4e91776bdbfd21b:/src/msw/fdrepdlg.cpp

diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 8ea315b657..924e7b3528 100644
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001
-// RCS-ID:      $Id$
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -114,7 +113,7 @@ wxFindReplaceDialogImpl::wxFindReplaceDialogImpl(wxFindReplaceDialog *dialog,
 
         if ( !ms_msgFindDialog )
         {
-            wxLogLastError(_T("RegisterWindowMessage(FINDMSGSTRING)"));
+            wxLogLastError(wxT("RegisterWindowMessage(FINDMSGSTRING)"));
         }
 
         wxWindow::MSWRegisterMessageHandler
@@ -210,14 +209,14 @@ wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win),
     static bool s_blockMsg = false;
 #endif // wxUSE_UNICODE_MSLU
 
-    wxASSERT_MSG( nMsg == ms_msgFindDialog, _T("unexpected message received") );
+    wxASSERT_MSG( nMsg == ms_msgFindDialog, wxT("unexpected message received") );
 
     FINDREPLACE *pFR = (FINDREPLACE *)lParam;
 
 #if wxUSE_UNICODE_MSLU
     // This is a hack for a MSLU problem: Versions up to 1.0.4011
     // of UNICOWS.DLL send the correct UNICODE item after button press
-    // and a bogus ANSI mode item right after this, so lets ignore
+    // and a bogus ANSI mode item right after this, so let's ignore
     // the second bogus message
     if ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags )
     {
@@ -240,27 +239,27 @@ wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win),
         // 2 cases
         dialog->GetImpl()->SetClosedByUser();
 
-        evtType = wxEVT_COMMAND_FIND_CLOSE;
+        evtType = wxEVT_FIND_CLOSE;
     }
     else if ( pFR->Flags & FR_FINDNEXT )
     {
-        evtType = wxEVT_COMMAND_FIND_NEXT;
+        evtType = wxEVT_FIND_NEXT;
     }
     else if ( pFR->Flags & FR_REPLACE )
     {
-        evtType = wxEVT_COMMAND_FIND_REPLACE;
+        evtType = wxEVT_FIND_REPLACE;
 
         replace = true;
     }
     else if ( pFR->Flags & FR_REPLACEALL )
     {
-        evtType = wxEVT_COMMAND_FIND_REPLACE_ALL;
+        evtType = wxEVT_FIND_REPLACE_ALL;
 
         replace = true;
     }
     else
     {
-        wxFAIL_MSG( _T("unknown find dialog event") );
+        wxFAIL_MSG( wxT("unknown find dialog event") );
 
         return 0;
     }
@@ -310,7 +309,7 @@ wxFindReplaceDialogHookProc(HWND hwnd,
         FINDREPLACE *pFR = (FINDREPLACE *)lParam;
         wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
 
-        ::SetWindowText(hwnd, dialog->GetTitle().wx_str());
+        ::SetWindowText(hwnd, dialog->GetTitle().t_str());
 
         // don't return FALSE from here or the dialog won't be shown
         return TRUE;
@@ -359,7 +358,7 @@ wxFindReplaceDialog::~wxFindReplaceDialog()
             // if it wasn't, delete the dialog ourselves
             if ( !::DestroyWindow(GetHwnd()) )
             {
-                wxLogLastError(_T("DestroyWindow(find dialog)"));
+                wxLogLastError(wxT("DestroyWindow(find dialog)"));
             }
         }
 
@@ -416,9 +415,9 @@ bool wxFindReplaceDialog::Show(bool show)
         return true;
     }
 
-    wxCHECK_MSG( m_FindReplaceData, false, _T("call Create() first!") );
+    wxCHECK_MSG( m_FindReplaceData, false, wxT("call Create() first!") );
 
-    wxASSERT_MSG( !m_impl, _T("why don't we have the window then?") );
+    wxASSERT_MSG( !m_impl, wxT("why don't we have the window then?") );
 
     m_impl = new wxFindReplaceDialogImpl(this, m_FindReplaceData->GetFlags());
 
@@ -443,15 +442,14 @@ bool wxFindReplaceDialog::Show(bool show)
         wxLogError(_("Failed to create the standard find/replace dialog (error code %d)"),
                    ::CommDlgExtendedError());
 
-        delete m_impl;
-        m_impl = NULL;
+        wxDELETE(m_impl);
 
         return false;
     }
 
     if ( !::ShowWindow(hwnd, SW_SHOW) )
     {
-        wxLogLastError(_T("ShowWindow(find dialog)"));
+        wxLogLastError(wxT("ShowWindow(find dialog)"));
     }
 
     m_hWnd = (WXHWND)hwnd;