SourceForge has been redesigned. Learn more.
Close

Diff of /win32/SciTEWinDlg.cxx [5db7c0] .. [81b7ce]  Maximize  Restore

Switch to side-by-side view

--- a/win32/SciTEWinDlg.cxx
+++ b/win32/SciTEWinDlg.cxx
@@ -779,7 +779,7 @@
 		return s;
 	}
 
-	void SetItemTextU(int id, const SString &s) {
+	void SetItemTextU(int id, const std::string &s) {
 		SetItemText(id, GUI::StringFromUTF8(s.c_str()).c_str());
 	}
 
@@ -1177,8 +1177,8 @@
 	case WM_INITDIALOG:
 		LocaliseDialog(hDlg);
 		FillCombos(dlg);
-		dlg.SetItemTextU(IDFINDWHAT, props.Get("find.what"));
-		dlg.SetItemTextU(IDDIRECTORY, props.Get("find.directory"));
+		dlg.SetItemTextU(IDFINDWHAT, props.GetString("find.what"));
+		dlg.SetItemTextU(IDDIRECTORY, props.GetString("find.directory"));
 		if (props.GetNewExpand("find.command") == "") {
 			// Empty means use internal that can respond to flags
 			dlg.SetCheck(IDWHOLEWORD, wholeWord);
@@ -1205,7 +1205,7 @@
 				WindowMessageBox(wFindInFiles, msgBuf, MB_OK | MB_ICONWARNING);
 				return FALSE;
 			}
-			findWhat = dlg.ItemTextU(IDFINDWHAT);
+			findWhat = dlg.ItemTextU(IDFINDWHAT).string();
 			props.Set("find.what", findWhat.c_str());
 			InsertFindInMemory();
 
@@ -1642,7 +1642,7 @@
 	return ret;
 }
 
-void SciTEWin::FindMessageBox(const SString &msg, const SString *findItem) {
+void SciTEWin::FindMessageBox(const SString &msg, const std::string *findItem) {
 	if (findItem == 0) {
 		GUI::gui_string msgBuf = LocaliseMessage(msg.c_str());
 		WindowMessageBox(wFindReplace.Created() ? wFindReplace : wSciTE, msgBuf, MB_OK | MB_ICONWARNING);