Release 1.2.4

changes.txt

@@ -1,3 +1,8 @@
+Version 1.2.5 (Not released yet)
+
+Version 1.2.4 (February 7, 2017)
+- Fixed: Regression with the "Replace" dialog not correctly searching for phrase to replace.
+
 Version 1.2.3 (February 7, 2017)
 - Added: "Rebuild All" menu option. Re-compiles all modules to object files rather than reusing existing version of the file.
 - Changed: Duplicate Line (Ctrl+D) will now duplicate entire block of selected text and not just the current caret line.
@@ -6,7 +11,6 @@ Version 1.2.3 (February 7, 2017)
 - Fixed: Cleared internal structures for function names, TYPES, etc when a document is closed.
 - Fixed: Clearing MRU list from top menu now immediately updates list shown in Explorer window.
 
-
 Version 1.2.2 (February 2, 2017)
 - Added: Find in Files functionality added.
 - Added: Add "TODO" messages directly in code via 'TODO: or ' TODO: List shows in Output window / TODO tab.

src/WinFBE.bas

@@ -37,7 +37,7 @@ Using Afx
 
 #Define APPNAME       WStr("WinFBE - FreeBASIC Editor")
 #Define APPNAMESHORT  WStr("WinFBE")
-#Define APPVERSION    WStr("1.2.3") 
+#Define APPVERSION    WStr("1.2.4") 
 
 
 #Include Once "modScintilla.bi"

src/frmFind.inc

@@ -44,13 +44,16 @@ Function Find_UpOrDown( ByVal flagUpDown As Long, _
    ' document must be added to the array twice because the initial searching may start part
    ' way through the document. The second time the document is accessed will search the 
    ' first part of the document that would have been missed the first time.
-   If cBool(gFind.nScopeFind = IDC_SCOPE1) OrElse (flagSearchCurrentOnly = True) Then   
+   If cBool(gFind.nScopeFind = IDC_SCOPE1) orelse _
+      cBool(gFind.nScopeReplace = IDC_SCOPE1) OrElse _
+      (flagSearchCurrentOnly = True) Then   
+print "search current only"
       ' Search current document
       ReDim pDocs(1) As clsDocument Ptr
       pDocs(0) = gTTabCtl.GetActiveDocumentPtr
       pDocs(1) = gTTabCtl.GetActiveDocumentPtr
       nTabCount = 2
-   Elseif gFind.nScopeFind = IDC_SCOPE2 then
+   Elseif (gFind.nScopeFind = IDC_SCOPE2) or (gFind.nScopeReplace = IDC_SCOPE2) then
       ' Search all loaded documents
       nTabCount = TabCtrl_GetItemCount(gTTabCtl.hWindow)           
       nCurTab   = TabCtrl_GetCurSel(gTTabCtl.hWindow)
@@ -63,7 +66,7 @@ Function Find_UpOrDown( ByVal flagUpDown As Long, _
       Next
       pDocs(nTabCount) = gTTabCtl.GetDocumentPtr(nCurTab)
       nTabCount = nTabCount + 1
-   Elseif gFind.nScopeFind = IDC_SCOPE3 then
+   Elseif (gFind.nScopeFind = IDC_SCOPE3) or (gFind.nScopeReplace = IDC_SCOPE3) then
       ' Search selected text
       ReDim pDocs(1) As clsDocument Ptr
       pDocs(0) = gTTabCtl.GetActiveDocumentPtr
@@ -83,6 +86,7 @@ Function Find_UpOrDown( ByVal flagUpDown As Long, _
       else
          ' Begin to search from the current position
          If flagUpDown = IDM_FINDNEXT Then
+  print "find next"
             startPos = Iif(curPos = -1, 0, SendMessageW( pDoc->hWindow, SCI_GETCURRENTPOS, 0, 0) + 1)
             endPos = SendMessageW( pDoc->hWindow, SCI_GETTEXTLENGTH, 0, 0)
          Else

src/frmReplace.inc

@@ -54,7 +54,8 @@ Function frmReplace_OnCommand(ByVal HWnd As HWnd, ByVal id As Long, ByVal hwndCt
             ' this to ensure that manually typed in text has been captured.
             Dim wszText As WString * MAX_PATH
             wszText = AfxGetWindowText( GetDlgItem(HWnd, IDC_FRMREPLACE_COMBOFIND) )
-            frmFind_AddToFindCombo(str(wszText))
+            gFind.txtFind = Str(wszText)
+            frmFind_AddToFindCombo(gFind.txtFind)
             wszText = AfxGetWindowText( GetDlgItem(HWnd, IDC_FRMREPLACE_COMBOREPLACE) )
             frmReplace_AddToReplaceCombo(str(wszText))