fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...

[wxWidgets.git] / utils / framelayout / src / controlbar.cpp

diff --git a/utils/framelayout/src/controlbar.cpp b/utils/framelayout/src/controlbar.cpp
index 308462ec431bb7eb8d1824e44450c463c971f418..d2401b700bc276312946d95f99bf589e4204f21a 100644 (file)
--- a/utils/framelayout/src/controlbar.cpp
+++ b/utils/framelayout/src/controlbar.cpp
@@ -331,6 +331,7 @@ bool wxFrameLayout::CanReparent()
 void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 {
 #ifdef __WXMSW__
 void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 {
 #ifdef __WXMSW__

+#if 0

 
        if ( pChild->GetParent() )
        {
 
        if ( pChild->GetParent() )
        {


@@ -344,6 +345,8 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
        pNewParent->GetChildren().Append( pChild );
 
        pChild->SetParent( pNewParent );
        pNewParent->GetChildren().Append( pChild );
 
        pChild->SetParent( pNewParent );

+#endif
+    pChild->Reparent(pNewParent);

 
        return;
 #endif
 
        return;
 #endif


@@ -354,9 +357,9 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 
        return;
 
 
        return;
 

-       pChild->ReParent( pNewParent );
+       //pChild->ReParent( pNewParent );

 
 

-       return;
+       //return;

 #endif
        
        wxMessageBox( "Sorry, docking is not supported for ports other than MSW and wxGTK" );
 #endif
        
        wxMessageBox( "Sorry, docking is not supported for ports other than MSW and wxGTK" );


@@ -795,7 +798,7 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
                pMiniFrm->Create( &GetParentFrame(), -1, pBar->mName, 
                                                  wxPoint( 50,50 ),
                                                  wxSize ( 0, 0  ),
                pMiniFrm->Create( &GetParentFrame(), -1, pBar->mName, 
                                                  wxPoint( 50,50 ),
                                                  wxSize ( 0, 0  ),

-                                                 wxSTAY_ON_TOP //| wxTHICK_FRAME 
+                          wxFRAME_FLOAT_ON_PARENT  |  wxFRAME_TOOL_WINDOW

                                                );
 
                pMiniFrm->SetClient( pBar->mpBarWnd );
                                                );
 
                pMiniFrm->SetClient( pBar->mpBarWnd );