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

Toolbar updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-02 21:10:52 +00:00
parent ba2b238e5d
commit 2590f154ff
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/os2/window.cpp
View File

@@ -2592,6 +2592,8 @@ MRESULT wxWindowOS2::OS2WindowProc(
{
if (pFrame->GetStatusBar())
pFrame->PositionStatusBar();
if (pFrame->GetToolBar())
pFrame->PositionToolBar();
}
}
}
@@ -4364,7 +4366,19 @@ int wxWindowOS2::GetOS2ParentHeight(
IsKindOf(CLASSINFO(wxMenuBar)) ||
IsKindOf(CLASSINFO(wxToolBar))
)
return(pParent->GetSize().y);
{
if (IsKindOf(CLASSINFO(wxToolBar)))
{
wxFrame* pFrame = wxDynamicCast(GetParent(), wxFrame);
if (pFrame->GetToolBar() == this)
return(pParent->GetSize().y);
else
return(pParent->GetClientSize().y);
}
else
return(pParent->GetSize().y);
}
else
return(pParent->GetClientSize().y);
}