From e459f82d0110709444984bf739314f4a84de48d3 Mon Sep 17 00:00:00 2001
From: "J. Russell Smyth" <drfish@cox.net>
Date: Sun, 23 May 1999 18:54:27 +0000
Subject: [PATCH] repaired recently broken framelayout

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 utils/framelayout/src/controlbar.cpp | 4 ++--
 utils/framelayout/src/dyntbar.cpp    | 3 ++-
 utils/framelayout/src/dyntbar.h      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/utils/framelayout/src/controlbar.cpp b/utils/framelayout/src/controlbar.cpp
index 308462ec43..425e151d9f 100644
--- a/utils/framelayout/src/controlbar.cpp
+++ b/utils/framelayout/src/controlbar.cpp
@@ -354,9 +354,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" );
diff --git a/utils/framelayout/src/dyntbar.cpp b/utils/framelayout/src/dyntbar.cpp
index a4bce48b0c..a5019a86c7 100644
--- 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();
 
@@ -359,6 +359,7 @@ void wxDynamicToolBar::Layout()
 	mpLayoutMan->Layout( wndDim, result, items, mVertGap, mHorizGap );;
 
 	SizeToolWindows();
+    return TRUE;
 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
diff --git a/utils/framelayout/src/dyntbar.h b/utils/framelayout/src/dyntbar.h
index e05f2e2e27..ca9225cad5 100644
--- 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 Layout();
+	virtual bool Layout();
 
 	virtual void GetPreferredDim( const wxSize& givenDim, wxSize& prefDim );
 
-- 
2.45.2