Compilation fix for r74440 and STL builds.

[wxWidgets.git] / src / common / fddlgcmn.cpp

diff --git a/src/common/fddlgcmn.cpp b/src/common/fddlgcmn.cpp
index d8c742511dcd2bc6bbb5ce6bdbb66a9655bcac9c..210d36e6d1739998794ce16984cadcc0b4761ef9 100644 (file)
--- a/src/common/fddlgcmn.cpp
+++ b/src/common/fddlgcmn.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fdrepdlg.cpp
+// Name:        src/common/fddlgcmn.cpp
 // Purpose:     common parts of wxFindReplaceDialog implementations
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.08.01
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "fdrepdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -41,11 +37,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent)
 
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE_ALL)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE)
+wxDEFINE_EVENT( wxEVT_FIND, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND_NEXT, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND_REPLACE, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND_REPLACE_ALL, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND_CLOSE, wxFindDialogEvent );
 
 // ============================================================================
 // implementations
@@ -74,19 +70,19 @@ void wxFindReplaceDialogBase::Send(wxFindDialogEvent& event)
 
     m_FindReplaceData->m_Flags = event.GetFlags();
     m_FindReplaceData->m_FindWhat = event.GetFindString();
-    if ( HasFlag(wxFR_REPLACEDIALOG) && 
-         (event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE || 
-          event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE_ALL) )
+    if ( HasFlag(wxFR_REPLACEDIALOG) &&
+         (event.GetEventType() == wxEVT_FIND_REPLACE ||
+          event.GetEventType() == wxEVT_FIND_REPLACE_ALL) )
     {
         m_FindReplaceData->m_ReplaceWith = event.GetReplaceString();
     }
 
-    // translate wxEVT_COMMAND_FIND_NEXT to wxEVT_COMMAND_FIND if needed
-    if ( event.GetEventType() == wxEVT_COMMAND_FIND_NEXT )
+    // translate wxEVT_FIND_NEXT to wxEVT_FIND if needed
+    if ( event.GetEventType() == wxEVT_FIND_NEXT )
     {
         if ( m_FindReplaceData->m_FindWhat != m_lastSearch )
         {
-            event.SetEventType(wxEVT_COMMAND_FIND);
+            event.SetEventType(wxEVT_FIND);
 
             m_lastSearch = m_FindReplaceData->m_FindWhat;
         }