don't take EVT_HEADER_END_DRAG into account if it indicates the the drag was cancelled

[wxWidgets.git] / src / generic / fdrepdlg.cpp

diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index b65f21ffc4ab55e087ddd6655af5724f16f45dd0..976ade0dec51b119d592e102c02b69b538938d16 100644 (file)
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -37,10 +37,10 @@
     #include "wx/radiobox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
     #include "wx/radiobox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"

+    #include "wx/settings.h"

 #endif
 
 #include "wx/fdrepdlg.h"
 #endif
 
 #include "wx/fdrepdlg.h"

-#include "wx/settings.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -87,6 +87,8 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
                                         const wxString& title,
                                         int style)
 {
                                         const wxString& title,
                                         int style)
 {

+    parent = GetParentForModalDialog(parent);
+

     if ( !wxDialog::Create(parent, wxID_ANY, title,
                            wxDefaultPosition, wxDefaultSize,
                            wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
     if ( !wxDialog::Create(parent, wxID_ANY, title,
                            wxDefaultPosition, wxDefaultSize,
                            wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER