X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a704c2b398dfb40e5bb294858e14ec3cc6a2f39..34a1d7328f198b5ad31c33a07a6078f089feb45f:/utils/framelayout/src/controlbar.cpp?ds=sidebyside

diff --git a/utils/framelayout/src/controlbar.cpp b/utils/framelayout/src/controlbar.cpp
index 2e1a462a0b..d2401b700b 100644
--- 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__
+#if 0
 
 	if ( pChild->GetParent() )
 	{
@@ -344,6 +345,8 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 	pNewParent->GetChildren().Append( pChild );
 
 	pChild->SetParent( pNewParent );
+#endif
+    pChild->Reparent(pNewParent);
 
 	return;
 #endif
@@ -354,9 +357,9 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 
 	return;
 
-	pChild->ReParent( pNewParent );
+	//pChild->ReParent( pNewParent );
 
-	return;
+	//return;
 #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  ),
-						  wxSTAY_ON_TOP //| wxTHICK_FRAME 
+                          wxFRAME_FLOAT_ON_PARENT  |  wxFRAME_TOOL_WINDOW
 						);
 
 		pMiniFrm->SetClient( pBar->mpBarWnd );
@@ -1563,11 +1566,9 @@ void wxFrameLayout::PushDefaultPlugins()
 {
 	// FIXME:: to much of the stuff for the default...
 
-	AddPlugin( CLASSINFO( cbSimpleCustomizationPlugin ) );
 	AddPlugin( CLASSINFO( cbRowLayoutPlugin       ) );
 	AddPlugin( CLASSINFO( cbBarDragPlugin         ) );
 	AddPlugin( CLASSINFO( cbPaneDrawPlugin ) );
-	AddPlugin( CLASSINFO( cbAntiflickerPlugin     ) );
 }
 
 void wxFrameLayout::AddPlugin( wxClassInfo* pPlInfo, int paneMask )