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