Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\fl\newbmpbtn.cpp
Last modified2005-09-18 10:01:48.001 +0200
Size22.2 Kb (855 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\fl\newbmpbtn.cpp
Last modified2006-01-17 19:12:42.001 +0100
Size22.4 Kb (856 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged7851
Inserted24
Deleted33
Ignored00
Changed12



   Comparison Details  

3 skipped lines
4 4 // Author:      Aleksandras Gluchovas
5 5 // Modified by:
6 6 // Created:     ??/09/98
7 // RCS-ID:      $Id: newbmpbtn.cpp,v 1.18 2005/08/23 16:02:44 ABX Exp $ 7 // RCS-ID:      $Id: newbmpbtn.cpp,v 1.18.2.1 2006/01/17 15:05:08 JS Exp $
8 8 // Copyright:   (c) Aleksandras Gluchovas
9 9 // Licence:     wxWindows licence
10 10 /////////////////////////////////////////////////////////////////////////////
313 skipped lines
324 324                                    wxPen& lowerRightSidePen )
325 325 {
326 326     wxBitmap* pBmp = GetStateLabel();
327    
328 327     int x = mMarginX - (outerLevel + 2);
329 328     int y = mMarginY - (outerLevel + 2);
330    
331 329     int height = pBmp->GetHeight() + (outerLevel + 2)*2 - 1;
332 330     int width  = pBmp->GetWidth()  + (outerLevel + 2)*2 - 1;
333    
334 331     dc.SetPen( upperLeftSidePen );
335 332     dc.DrawLine( x,y, x + width, y  );
336 333     dc.DrawLine( x,y, x, y + height );
  334     dc.DrawLine( x,y+1, x + width , y +1 );  // top
  335     dc.DrawLine( x+1,y, x+1, y + height );  // left
337 336  
338 337     dc.SetPen( lowerRightSidePen );
339 338     dc.DrawLine( x + width, y, x + width, y + height + 1  );
340 339     dc.DrawLine( x, y + height, x + width, y + height );
  340     dc.DrawLine( x + width-1, y+1, x + width-1, y + height +1  );  // right
  341     dc.DrawLine( x +1, y + height-1, x + width, y + height-1 );  // bottom
341 342 }
342 343  
343 344 void wxNewBitmapButton::DestroyLabels()
512 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:05.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.