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
18 18     inCallTipMode = false;
19 19     posStartCallTip = 0;
20 20     val = 0;
21     xUp = -100; 21     rectUp = PRectangle(0,0,0,0);
22     xDown = -100; 22     rectDown = PRectangle(0,0,0,0);
23 23     lineHeight = 1;
24 24     startHighlight = 0;
25 25     endHighlight = 0;
49 skipped lines
75 75         if (IsArrowCharacter(s[startSeg])) {
76 76         xEnd = x + widthArrow;
77 77         offsetMain = xEnd;
  78         rcClient.left = x;
  79         rcClient.right = xEnd;
78 80         if (draw) {
79 81         const int halfWidth = widthArrow / 2 - 3;
80 82         const int centreX = x + widthArrow / 2 - 1;
81 83         const int centreY = (rcClient.top + rcClient.bottom) / 2;
82         rcClient.left = x;  
83         rcClient.right = xEnd;  
84 84         surface->FillRectangle(rcClient, colourBG.allocated);
85 85         PRectangle rcClientInner(rcClient.left+1, rcClient.top+1, rcClient.right-2, rcClient.bottom-1);
86 86         surface->FillRectangle(rcClientInner, colourUnSel.allocated);
17 skipped lines
104 104         surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
105 105                     colourBG.allocated, colourBG.allocated);
106 106         }
107         } else { 107         }
108         if (s[startSeg] == '\001') { 108         if (s[startSeg] == '\001') {
109         xUp = x+1; 109         rectUp = rcClient;
110         } else { 110         } else if (s[startSeg] == '\002') {
111         xDown = x+1; 111         rectDown = rcClient;
112         }  
113 112         }
114 113         } else {
115 114         xEnd = x + surface->WidthText(font, s+startSeg, endSeg - startSeg);
87 skipped lines
203 202  
204 203 void CallTip::MouseClick(Point pt) {
205 204     clickPlace = 0;
206     if (pt.y < lineHeight) { 205     if (rectUp.Contains(pt))
207         if ((pt.x > xUp) && (pt.x < xUp + widthArrow - 2)) {  
208         clickPlace = 1; 206         clickPlace = 1;
209         } else if ((pt.x > xDown) && (pt.x < xDown + widthArrow - 2)) { 207     if (rectDown.Contains(pt))
210         clickPlace = 2; 208         clickPlace = 2;
211         }  
212     }  
213 209 }
214 210  
215 211 PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn,
24 skipped lines
240 236     int numLines = 1;
241 237     const char *newline;
242 238     const char *look = val;
243     xUp = -100; 239     rectUp = PRectangle(0,0,0,0);
244     xDown = -100; 240     rectDown = PRectangle(0,0,0,0);
245 241     offsetMain = 5;
246 242     int width = PaintContents(surfaceMeasure, false) + 5;
247 243     while ((newline = strchr(look, '\n')) != NULL) {
28 skipped lines

   Text comparison Options  

Syntax colouring language used: C / C++
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  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

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