From 52d802ebb80982e9541aac3c4f7ba91aec503425 Mon Sep 17 00:00:00 2001 From: "J. Russell Smyth" Date: Wed, 14 Jul 1999 17:31:42 +0000 Subject: [PATCH] Changed to use new wxWindow->Reparent call to allow build with current cvs Added several small fixes from Scott Pleiter git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/framelayout/src/controlbar.cpp | 5 ++++- utils/framelayout/src/toolwnd.cpp | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/framelayout/src/controlbar.cpp b/utils/framelayout/src/controlbar.cpp index 425e151d9f..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 @@ -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 ); diff --git a/utils/framelayout/src/toolwnd.cpp b/utils/framelayout/src/toolwnd.cpp index 2cb14b99f0..ce78b52c6e 100644 --- a/utils/framelayout/src/toolwnd.cpp +++ b/utils/framelayout/src/toolwnd.cpp @@ -160,6 +160,7 @@ void wxToolWindow::AddMiniButton( cbMiniButton* pBtn ) void wxToolWindow::OnPaint( wxPaintEvent& event ) { + wxPaintDC pdc( this ); wxWindowDC dc( this ); int w,h; -- 2.45.2