repaired recently broken framelayout

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/framelayout/src/controlbar.cpp b/utils/framelayout/src/controlbar.cpp
index 308462ec431bb7eb8d1824e44450c463c971f418..425e151d9f5cfe5645530826d353a79589d46891 100644 (file)
--- a/utils/framelayout/src/controlbar.cpp
+++ b/utils/framelayout/src/controlbar.cpp
@@ -354,9 +354,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" );

diff --git a/utils/framelayout/src/dyntbar.cpp b/utils/framelayout/src/dyntbar.cpp
index a4bce48b0cb87ac99b5ddddf374b615af7f88336..a5019a86c7905f6b67633e32b0c2018c2645fdfa 100644 (file)
--- a/utils/framelayout/src/dyntbar.cpp
+++ b/utils/framelayout/src/dyntbar.cpp
@@ -342,7 +342,7 @@ void wxDynamicToolBar::SizeToolWindows()
        }
 }
 
        }
 }
 

-void wxDynamicToolBar::Layout()
+bool wxDynamicToolBar::Layout()

 {
        if ( !mpLayoutMan ) mpLayoutMan = CreateDefaulLayout();
 
 {
        if ( !mpLayoutMan ) mpLayoutMan = CreateDefaulLayout();
 


@@ -359,6 +359,7 @@ void wxDynamicToolBar::Layout()
        mpLayoutMan->Layout( wndDim, result, items, mVertGap, mHorizGap );;
 
        SizeToolWindows();
        mpLayoutMan->Layout( wndDim, result, items, mVertGap, mHorizGap );;
 
        SizeToolWindows();

+    return TRUE;

 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )

diff --git a/utils/framelayout/src/dyntbar.h b/utils/framelayout/src/dyntbar.h
index e05f2e2e275ad2c49108aebe771b88736965f31f..ca9225cad52afa784cd9d96e41834a5d30810955 100644 (file)
--- a/utils/framelayout/src/dyntbar.h
+++ b/utils/framelayout/src/dyntbar.h
@@ -141,7 +141,7 @@ public:
        virtual void DrawSeparator( wxDynToolInfo& info, wxDC& dc );
 
        // see definitions of orientation types
        virtual void DrawSeparator( wxDynToolInfo& info, wxDC& dc );
 
        // see definitions of orientation types

-       virtual void Layout();
+       virtual bool Layout();

 
        virtual void GetPreferredDim( const wxSize& givenDim, wxSize& prefDim );
 
 
        virtual void GetPreferredDim( const wxSize& givenDim, wxSize& prefDim );