[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS RxRichEditX.cpp,1.44,1.45

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv27307

Modified Files:
	RxRichEditX.cpp 
Log Message:
Reverted WordAtCursor changes that somehow got dropped since r1.38


Index: RxRichEditX.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** RxRichEditX.cpp	22 Jun 2003 23:50:23 -0000	1.44
--- RxRichEditX.cpp	25 Jun 2003 23:25:32 -0000	1.45
***************
*** 882,889 ****
--- 882,891 ----
  
  	TCharRange Range;
+ 	WideString TestStr = "";
  	WideString Result = "";
  
  	if (HandleAllocated()) {
  		long max = TextLen() - 1;
+ 		bool pre = true;
  		for (int i = 0; (SelStart + i) < max; i++) {
  			Range.cpMax = SelStart + i;
***************
*** 896,902 ****
  				Range.cpMin++;
  			Range.cpMax = SendMessage(Handle, EM_FINDWORDBREAK, WB_RIGHTBREAK, Range.cpMax);
! 			Result = Trim(GetTextRange(Range.cpMin, Range.cpMax));
! 			if (Range.cpMax - Range.cpMin)
  				break;
  		}
  	}
--- 898,938 ----
  				Range.cpMin++;
  			Range.cpMax = SendMessage(Handle, EM_FINDWORDBREAK, WB_RIGHTBREAK, Range.cpMax);
! 			TestStr = Trim(GetTextRange(Range.cpMin, Range.cpMax));
! 			if (pre)
! 				Result = TestStr;
! 			else	Result += TestStr;
! 			
! 			if (Range.cpMin > 1)
! 				Range.cpMin--;
! 			TestStr = Trim(GetTextRange(Range.cpMin, Range.cpMax));
! 			
! 			int testlen = TestStr.Length();
! 
! 			if (!testlen)
! 				continue;
! 
! 			if ((pre) && (TestStr[1] == '-') && (Range.cpMin > 1)) {
! 				if (testlen > 1) {
! 					if ((isdigit(TestStr[2])) || (toupper(TestStr[2]) == TestStr[2])) {
! 						i = 0;
! 						SelStart = Range.cpMin-1;
! 						continue;
! 					}
! 				}
! 			}
! 			
! 			if ((TestStr[testlen] == '-') && (Range.cpMax < (max-1))) {
! 				if (testlen > 1) {
! 					if ((isdigit(TestStr[testlen-1])) || (toupper(TestStr[testlen-1]) == TestStr[testlen-1])) {
! 						i = 0;
! 						SelStart = Range.cpMax+1;
! 						pre = false;
! 						continue;
! 					}
! 				}
! 			}
! 			if (Result.Length())
  				break;
+ 				
  		}
  	}
***************
*** 923,926 ****
--- 959,963 ----
  	return Result;
  }
+ 
  
  void TRxRichEditX::makeLinks() {