assert if opening more than one find/replace dialog under the same parent -- this...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 0c3f2cff644b8f32cb898370f942ccc790d3d49a..5fa2be38e2235846d14e06dde026ea229af6028b 100644 (file)
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -190,14 +190,14 @@ void wxFindReplaceDialogImpl::SubclassDialog(HWND hwnd)
 
     // check that we don't subclass the parent twice: this would be a bad idea
     // as then we'd have infinite recursion in wxFindReplaceWindowProc
-    if ( !wxCheckWindowWndProc((WXHWND)hwnd, (WXFARPROC)wxFindReplaceWindowProc) )
-    {
-        // set the new one and save the old as user data to allow access to it
-        // from wxFindReplaceWindowProc
-        m_oldParentWndProc = wxSetWindowProc(hwnd, wxFindReplaceWindowProc);
+    wxCHECK_RET( wxGetWindowProc(hwnd) != wxFindReplaceWindowProc,
+                 _T("can't have more than one find dialog currently") );
 
-        wxSetWindowUserData(hwnd, (void *)m_oldParentWndProc);
-    }
+    // set the new one and save the old as user data to allow access to it
+    // from wxFindReplaceWindowProc
+    m_oldParentWndProc = wxSetWindowProc(hwnd, wxFindReplaceWindowProc);
+
+    wxSetWindowUserData(hwnd, (void *)m_oldParentWndProc);
 }
 
 wxFindReplaceDialogImpl::~wxFindReplaceDialogImpl()