Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\fl\controlbar.cpp
Last modified2005-09-18 10:01:48.001 +0200
Size81.7 Kb (3541 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\fl\controlbar.cpp
Last modified2006-02-05 22:38:26.001 +0100
Size81.4 Kb (3522 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged43519
Inserted00
Deleted00
Ignored00
Changed325



   Comparison Details  

3 skipped lines
4U4U// Author:      Aleksandras Gluchovas
5U5U// Modified by:
6U6U// Created:     06/09/98
7C// RCS-ID:      $Id: controlbar.cpp,v 1.26 2005/08/23 16:02:44 ABX Exp $ 7C// RCS-ID:      $Id: controlbar.cpp,v 1.26.2.1 2006/02/11 02:06:12 MR Exp $
8U8U// Copyright:   (c) Aleksandras Gluchovas
9U9U// Licence:     wxWindows license
10U10U/////////////////////////////////////////////////////////////////////////////
359 skipped lines
370U370U 
371U371Uvoid wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
372U372U{
373C#ifdef __WXMSW__  
374C#if 0  
375C   
376C    if ( pChild->GetParent() )  
377C    {  
378C        bool success = pChild->GetParent()->GetChildren().DeleteObject( pChild );  
379C   
380C        wxASSERT( success ); // DBG::  
381C    }  
382C   
383C    ::SetParent( (HWND)pChild->m_hWnd, (HWND)pNewParent->m_hWnd  );  
384C   
385C    pNewParent->GetChildren().Append( pChild );  
386C   
387C    pChild->SetParent( pNewParent );  
388C#endif  
389C    pChild->Reparent(pNewParent);  
390C   
391C    return;  
392C#elif defined(__WXGTK20__) 373C#if defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXMAC__)
393U374U    pChild->Reparent(pNewParent);
394U375U 
395U376U    return;
8 skipped lines
404U385U#else
405U386U    wxUnusedVar(pChild);
406U387U    wxUnusedVar(pNewParent);
407C    wxMessageBox( "Sorry, docking is not supported for ports other than MSW and wxGTK" ); 388C    wxMessageBox( _("Sorry, docking is not supported for ports other thawxMSW, wxMac and wxGTK") );
408U389U#endif
409U390U}
410U391U 
3131 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:23.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.