Index: abi/src/wp/ap/win/ap_Win32Dialog_Replace.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Replace.cpp,v
retrieving revision 1.23
diff -u -r1.23 ap_Win32Dialog_Replace.cpp
--- abi/src/wp/ap/win/ap_Win32Dialog_Replace.cpp	7 May 2003 07:13:07 
-0000	1.23
+++ abi/src/wp/ap/win/ap_Win32Dialog_Replace.cpp	22 May 2003 09:46:28 -0000
@@ -49,9 +49,6 @@
											   XAP_Dialog_Id id)
	: AP_Dialog_Replace(pDlgFactory,id)
{
-	m_findString = NULL;
-	m_replaceString = NULL;
-	m_matchCase = true;
	m_hWnd = 0;
}

@@ -287,6 +284,14 @@
		setMatchCase((IsDlgButtonChecked(hWnd,AP_RID_DIALOG_REPLACE_CHECK_MATCHCASE)==BST_CHECKED));
		return 1;

+	case AP_RID_DIALOG_REPLACE_CHECK_WHOLEWORD:
+		setWholeWord((IsDlgButtonChecked(hWnd,AP_RID_DIALOG_REPLACE_CHECK_WHOLEWORD)==BST_CHECKED));
+		return 1;
+
+	case AP_RID_DIALOG_REPLACE_CHECK_REVERSEFIND:
+		setReverseFind((IsDlgButtonChecked(hWnd,AP_RID_DIALOG_REPLACE_CHECK_REVERSEFIND)==BST_CHECKED));
+		return 1;
+
	case AP_RID_DIALOG_REPLACE_BTN_FINDNEXT:
		return _onBtn_FindNext(hWnd);

@@ -328,7 +333,12 @@
		goto FreeMemory;

	setFindString(pUCSFind);
-	findNext();
+	if (!getReverseFind()) {
+		findNext();
+		}
+	else {
+		findPrev();
+		}

FreeMemory:
	DELETEP(pBufFromDialogFind);
@@ -378,7 +388,12 @@

	setFindString(pUCSFind);
	setReplaceString(pUCSReplace);
-	findReplace();
+	if (!getReverseFind()) {
+		findReplace();
+		}
+	else {
+		findReplaceReverse();
+		}

FreeMemory:
	DELETEP(pBufFromDialogFind);