X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1469addcd748014836f254258357f05f70dad01..bd73ba41f93a040ecf9c18040d7f788992d0a6ec:/utils/framelayout/src/controlbar.cpp diff --git a/utils/framelayout/src/controlbar.cpp b/utils/framelayout/src/controlbar.cpp index 308462ec43..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 );