fixes for new lib dirs for wxMSW

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

diff --git a/src/common/fddlgcmn.cpp b/src/common/fddlgcmn.cpp
index 17494e17592c2870417a8e3db8de50b248a41b64..0a6438576e84a3dc8ffeb9d2351a41023b44311a 100644 (file)
--- a/src/common/fddlgcmn.cpp
+++ b/src/common/fddlgcmn.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fdrepdlg.h"
 #endif
 
@@ -74,7 +74,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();
     }