Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repaired recently broken framelayout

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
J. Russell Smyth
1999-05-23 18:54:27 +00:00
parent 86fdd27b45
commit e459f82d01
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/framelayout/src/controlbar.cpp
View File

@@ -354,9 +354,9 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
return; return;
pChild->ReParent( pNewParent ); //pChild->ReParent( pNewParent );
return; //return;
#endif #endif
wxMessageBox( "Sorry, docking is not supported for ports other than MSW and wxGTK" ); wxMessageBox( "Sorry, docking is not supported for ports other than MSW and wxGTK" );

3
utils/framelayout/src/dyntbar.cpp
View File

@@ -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 );; mpLayoutMan->Layout( wndDim, result, items, mVertGap, mHorizGap );;
SizeToolWindows(); SizeToolWindows();
return TRUE;
} }
void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim ) void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )

2
utils/framelayout/src/dyntbar.h
View File

@@ -141,7 +141,7 @@ public:
virtual void DrawSeparator( wxDynToolInfo& info, wxDC& dc ); virtual void DrawSeparator( wxDynToolInfo& info, wxDC& dc );
// see definitions of orientation types // 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 );