Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\ScintillaBase.cxx
Last modified2005-03-21 12:17:54.000 +0100
Size15.4 Kb (646 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\ScintillaBase.cxx
Last modified2006-03-16 13:07:08.000 +0100
Size17.2 Kb (713 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged25610
Inserted1055
Deleted22
Ignored00
Changed1282



   Comparison Details  

37 skipped lines
38U38UScintillaBase::ScintillaBase() {
39U39U    displayPopupMenu = true;
40U40U    listType = 0;
  41A    maxListWidth = 0;
41U42U#ifdef SCI_LEXER
42U43U    lexLanguage = SCLEX_CONTAINER;
  44A    performingStyle = false;
43U45U    lexCurrent = 0;
44U46U    for (int wl = 0;wl < numWordLists;wl++)
45U47U        keyWordLists[wl] = new WordList;
168 skipped lines
214U216U        return;
215U217U        }
216U218U    }
  219C    ac.Start(wMain, idAutoComplete, currentPos, LocationFromPosition(currentPos),
217C    ac.Start(wMain, idAutoComplete, currentPos, lenEntered, vs.lineHeight, IsUnicodeMode()); 220C        lenEntered, vs.lineHeight, IsUnicodeMode());
218U221U 
219U222U    PRectangle rcClient = GetClientRectangle();
220U223U    Point pt = LocationFromPosition(currentPos - lenEntered);
21 skipped lines
242U245U    rcac.bottom = Platform::Minimum(rcac.top + heightLB, rcClient.bottom);
243U246U    ac.lb->SetPositionRelative(rcac, wMain);
244U247U    ac.lb->SetFont(vs.styles[STYLE_DEFAULT].font);
245C    ac.lb->SetAverageCharWidth(vs.styles[STYLE_DEFAULT].aveCharWidth); 248C    unsigned int aveCharWidth = vs.styles[STYLE_DEFAULT].aveCharWidth;
  249C    ac.lb->SetAverageCharWidth(aveCharWidth);
246U250U    ac.lb->SetDoubleClickAction(AutoCompleteDoubleClick, this);
247U251U 
248U252U    ac.SetList(list);
2 skipped lines
251U255U    PRectangle rcList = ac.lb->GetDesiredRect();
252U256U    int heightAlloced = rcList.bottom - rcList.top;
253U257U    widthLB = Platform::Maximum(widthLB, rcList.right - rcList.left);
  258A    if (maxListWidth != 0)
  259A        widthLB = Platform::Minimum(widthLB, aveCharWidth*maxListWidth);
254U260U    // Make an allowance for large strings in list
255U261U    rcList.left = pt.x - ac.lb->CaretFromEdge();
256U262U    rcList.right = rcList.left + widthLB;
5 skipped lines
262U268U    }
263U269U    rcList.bottom = rcList.top + heightAlloced;
264U270U    ac.lb->SetPositionRelative(rcList, wMain);
265C    ac.Show(); 271C    ac.Show(true);
266U272U    if (lenEntered != 0) {
267U273U        AutoCompleteMoveToCurrentWord();
268U274U    }
43 skipped lines
312U318U    selected[0] = '\0';
313U319U    if (item != -1) {
314U320U        ac.lb->GetValue(item, selected, sizeof(selected));
  321A    } else {
  322A        ac.Cancel();
  323A        return;
315U324U    }
  325C 
316C    ac.Cancel(); 326C    ac.Show(false);
  327C 
  328C    listSelected = selected;
  329C    SCNotification scn = {0};
  330C    scn.nmhdr.code = listType > 0 ? SCN_USERLISTSELECTION : SCN_AUTOCSELECTION;
  331C    scn.message = 0;
  332C    scn.wParam = listType;
  333C    scn.listType = listType;
  334C    Position firstPos = ac.posStart - ac.startLen;
  335C    scn.lParam = firstPos;
  336C    scn.text = listSelected.c_str();
  337C    NotifyParent(scn);
  338C 
317C    if (item == -1) 339C    if (!ac.Active())
318U340U        return;
  341A    ac.Cancel();
319U342U 
320C    if (listType > 0) { 343C    if (listType > 0)
321C        userListSelected = selected;  
322C        SCNotification scn;  
323C        scn.nmhdr.code = SCN_USERLISTSELECTION;  
324C        scn.message = 0;  
325C        scn.wParam = listType;  
326C        scn.listType = listType;  
327C        scn.lParam = 0;  
328C        scn.text = userListSelected.c_str();  
329C        NotifyParent(scn);  
330U344U        return;
331R    }  
332U345U 
333R    Position firstPos = ac.posStart - ac.startLen;  
334U346U    Position endPos = currentPos;
335U347U    if (ac.dropRestOfWord)
336U348U        endPos = pdoc->ExtendWordSelect(endPos, 1, true);
41 skipped lines
378U390U}
379U391U 
380U392Uvoid ScintillaBase::CallTipClick() {
381C    SCNotification scn; 393C    SCNotification scn = {0};
382U394U    scn.nmhdr.code = SCN_CALLTIPCLICK;
383U395U    scn.position = ct.clickPlace;
384U396U    NotifyParent(scn);
45 skipped lines
430U442U}
431U443U 
432U444Uvoid ScintillaBase::Colourise(int start, int end) {
433C    int lengthDoc = pdoc->Length(); 445C    if (!performingStyle) {
434C    if (end == -1) 446C        // Protect against reentrance, which may occur, for example, when
435C        end = lengthDoc; 447C        // fold points are discovered while performing styling and the folding
  448C        // code looks for child lines which may trigger styling.
436C    int len = end - start; 449C        performingStyle = true;
437U450U 
438C    PLATFORM_ASSERT(len >= 0); 451C        int lengthDoc = pdoc->Length();
  452C        if (end == -1)
439C    PLATFORM_ASSERT(start + len <= lengthDoc); 453C        end = lengthDoc;
  454C        int len = end - start;
440U455U 
441C    //WindowAccessor styler(wMain.GetID(), props); 456C        PLATFORM_ASSERT(len >= 0);
442C    DocumentAccessor styler(pdoc, props, wMain.GetID()); 457C        PLATFORM_ASSERT(start + len <= lengthDoc);
443U458U 
444C    int styleStart = 0; 459C        //WindowAccessor styler(wMain.GetID(), props);
445C    if (start > 0)  
446C        styleStart = styler.StyleAt(start - 1); 460C        DocumentAccessor styler(pdoc, props, wMain.GetID());
447C    styler.SetCodePage(pdoc->dbcsCodePage);  
448U461U 
  462C        int styleStart = 0;
  463C        if (start > 0)
  464C        styleStart = styler.StyleAt(start - 1);
  465C        styler.SetCodePage(pdoc->dbcsCodePage);
  466C 
449C    if (lexCurrent && (len > 0)) {  // Should always succeed as null lexer should always be available 467C        if (lexCurrent && (len > 0)) {  // Should always succeed as null lexer should always be available
450C        lexCurrent->Lex(start, len, styleStart, keyWordLists, styler);  
451C        styler.Flush();  
452C        if (styler.GetPropertyInt("fold")) {  
453C        lexCurrent->Fold(start, len, styleStart, keyWordLists, styler); 468C        lexCurrent->Lex(start, len, styleStart, keyWordLists, styler);
454U469U        styler.Flush();
  470A        if (styler.GetPropertyInt("fold")) {
  471A        lexCurrent->Fold(start, len, styleStart, keyWordLists, styler);
  472A        styler.Flush();
  473A        }
455U474U        }
  475A 
  476A        performingStyle = false;
456U477U    }
457U478U}
458U479U#endif
94 skipped lines
553U574U    case SCI_AUTOCGETDROPRESTOFWORD:
554U575U        return ac.dropRestOfWord;
555U576U 
  577A    case SCI_AUTOCSETMAXHEIGHT:
  578A        ac.lb->SetVisibleRows(wParam);
  579A        break;
  580A 
  581A    case SCI_AUTOCGETMAXHEIGHT:
4 skipped lines
  586A        break;
  587A 
  588A    case SCI_AUTOCGETMAXWIDTH:
  589A        return maxListWidth;
  590A 
556U591U    case SCI_REGISTERIMAGE:
557U592U        ac.lb->RegisterImage(wParam, reinterpret_cast<const char *>(lParam));
558U593U        break;
57 skipped lines
616U651U        return lexLanguage;
617U652U 
618U653U    case SCI_COLOURISE:
  654C        if (lexLanguage == SCLEX_CONTAINER) {
  655C        pdoc->ModifiedAt(wParam);
  656C        NotifyStyleToNeeded((lParam == -1) ? pdoc->Length() : lParam);
  657C        } else {
619C        Colourise(wParam, lParam); 658C        Colourise(wParam, lParam);
  659C        }
620U660U        Redraw();
621U661U        break;
622U662U 
2 skipped lines
625U665U                  reinterpret_cast<const char *>(lParam));
626U666U        break;
627U667U 
  668A    case SCI_GETPROPERTY: {
  669A        SString val = props.Get(reinterpret_cast<const char *>(wParam));
  670A        const int n = val.length();
  671A        if (lParam != 0) {
  672A        char *ptr = reinterpret_cast<char *>(lParam);
15 skipped lines
  688A        }
  689A 
  690A    case SCI_GETPROPERTYINT:
  691A        return props.GetInt(reinterpret_cast<const char *>(wParam), lParam);
  692A 
628U693U    case SCI_SETKEYWORDS:
629U694U        if (wParam < numWordLists) {
630U695U        keyWordLists[wParam]->Clear();
5 skipped lines
636U701U        SetLexerLanguage(reinterpret_cast<const char *>(lParam));
637U702U        break;
638U703U 
  704A    case SCI_GETSTYLEBITSNEEDED:
  705A        return lexCurrent ? lexCurrent->GetStyleBitsNeeded() : 5;
639U706U#endif
640U707U 
641U708U    default:
5 skipped lines

   Text comparison Options  

Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

This report has been generated by Ellié Computing Merge on 2006-09-07 16:23:45.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.