fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/common/fddlgcmn.cpp b/src/common/fddlgcmn.cpp
index 17494e17592c2870417a8e3db8de50b248a41b64..d1a6f9ab09ff7923395fe32241857f7428a783ab 100644 (file)
--- a/src/common/fddlgcmn.cpp
+++ b/src/common/fddlgcmn.cpp
@@ -4,7 +4,7 @@
 // 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_COMMAND_FIND, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_FIND_NEXT, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_FIND_REPLACE, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_FIND_REPLACE_ALL, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_FIND_CLOSE, wxFindDialogEvent );
 
 // ============================================================================
 // implementations
@@ -74,7 +70,9 @@ void wxFindReplaceDialogBase::Send(wxFindDialogEvent& event)
 
     m_FindReplaceData->m_Flags = event.GetFlags();
     m_FindReplaceData->m_FindWhat = event.GetFindString();
-    if ( HasFlag(wxFR_REPLACEDIALOG) )
+    if ( HasFlag(wxFR_REPLACEDIALOG) &&
+         (event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE ||
+          event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE_ALL) )
     {
         m_FindReplaceData->m_ReplaceWith = event.GetReplaceString();
     }