Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\CallTip.cxx
Last modified2005-03-21 12:17:52.000 +0100
Size8.3 Kb (275 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\CallTip.cxx
Last modified2006-03-16 13:07:02.000 +0100
Size8.3 Kb (271 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged7256
Inserted12
Deleted12
Ignored00
Changed430



   Comparison Details  

17 skipped lines
18U18U    inCallTipMode = false;
19U19U    posStartCallTip = 0;
20U20U    val = 0;
21C    xUp = -100; 21C    rectUp = PRectangle(0,0,0,0);
22C    xDown = -100; 22C    rectDown = PRectangle(0,0,0,0);
23U23U    lineHeight = 1;
24U24U    startHighlight = 0;
25U25U    endHighlight = 0;
49 skipped lines
75U75U        if (IsArrowCharacter(s[startSeg])) {
76U76U        xEnd = x + widthArrow;
77U77U        offsetMain = xEnd;
  78A        rcClient.left = x;
  79A        rcClient.right = xEnd;
78U80U        if (draw) {
79U81U        const int halfWidth = widthArrow / 2 - 3;
80U82U        const int centreX = x + widthArrow / 2 - 1;
81U83U        const int centreY = (rcClient.top + rcClient.bottom) / 2;
82R        rcClient.left = x;  
83R        rcClient.right = xEnd;  
84U84U        surface->FillRectangle(rcClient, colourBG.allocated);
85U85U        PRectangle rcClientInner(rcClient.left+1, rcClient.top+1, rcClient.right-2, rcClient.bottom-1);
86U86U        surface->FillRectangle(rcClientInner, colourUnSel.allocated);
17 skipped lines
104U104U        surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
105U105U                    colourBG.allocated, colourBG.allocated);
106U106U        }
107C        } else { 107C        }
108C        if (s[startSeg] == '\001') { 108C        if (s[startSeg] == '\001') {
109C        xUp = x+1; 109C        rectUp = rcClient;
110C        } else { 110C        } else if (s[startSeg] == '\002') {
111C        xDown = x+1; 111C        rectDown = rcClient;
112C        }  
113U112U        }
114U113U        } else {
115U114U        xEnd = x + surface->WidthText(font, s+startSeg, endSeg - startSeg);
87 skipped lines
203U202U 
204U203Uvoid CallTip::MouseClick(Point pt) {
205U204U    clickPlace = 0;
206C    if (pt.y < lineHeight) { 205C    if (rectUp.Contains(pt))
207C        if ((pt.x > xUp) && (pt.x < xUp + widthArrow - 2)) {  
208C        clickPlace = 1; 206C        clickPlace = 1;
209C        } else if ((pt.x > xDown) && (pt.x < xDown + widthArrow - 2)) { 207C    if (rectDown.Contains(pt))
210C        clickPlace = 2; 208C        clickPlace = 2;
211C        }  
212C    }  
213U209U}
214U210U 
215U211UPRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn,
24 skipped lines
240U236U    int numLines = 1;
241U237U    const char *newline;
242U238U    const char *look = val;
243C    xUp = -100; 239C    rectUp = PRectangle(0,0,0,0);
244C    xDown = -100; 240C    rectDown = PRectangle(0,0,0,0);
245U241U    offsetMain = 5;
246U242U    int width = PaintContents(surfaceMeasure, false) + 5;
247U243U    while ((newline = strchr(look, '\n')) != NULL) {
28 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:30.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.