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

diff --git a/utils/framelayout/src/controlbar.cpp b/utils/framelayout/src/controlbar.cpp
index 425e151d9f5cfe5645530826d353a79589d46891..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


@@ -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 );

diff --git a/utils/framelayout/src/toolwnd.cpp b/utils/framelayout/src/toolwnd.cpp
index 2cb14b99f0ca23e20e9f64b498a3ca311b81b014..ce78b52c6efc8e665ecd1fca819e9a4b54435abf 100644 (file)
--- 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 )
 {
 
 void wxToolWindow::OnPaint( wxPaintEvent& event )
 {

+    wxPaintDC pdc( this );

        wxWindowDC dc( this );
 
        int w,h;
        wxWindowDC dc( this );
 
        int w,h;