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