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

Applied patch #1582212 (completed/fixed toolbar's wxTB_BOTTOM implementation).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-10-22 13:52:20 +00:00
parent c4a34cf8c5
commit 90a6ac27c7
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/os2/frame.cpp
View File

@@ -704,13 +704,20 @@ void wxFrame::PositionToolBar()
,vTHeight ,vTHeight
); );
} }
else if (pToolBar->GetWindowStyleFlag() & wxTB_BOTTOM ) else if (pToolBar->GetWindowStyleFlag() & wxTB_BOTTOM)
{ {
wxCoord vSwidth = 0;
wxCoord vSheight = 0;
if (m_frameStatusBar)
m_frameStatusBar->GetSize( &vSwidth
,&vSheight
);
vWidth = (wxCoord)(vRect.xRight - vRect.xLeft); vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
pToolBar->SetSize( vRect.xLeft - vFRect.xLeft pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
,vRect.yBottom - vTHeight // assuming the vRect contains the client coordinates ,vFRect.yTop - vRect.yBottom - vTHeight - vSheight
,vWidth ,vWidth
,vHeight ,vTHeight
); );
} }
else else
@@ -1108,6 +1115,13 @@ MRESULT EXPENTRY wxFrameMainWndProc( HWND hWnd,
pSWP[i].cx = vRectl.xRight - vRectl.xLeft; pSWP[i].cx = vRectl.xRight - vRectl.xLeft;
pSWP[i].cy = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2); pSWP[i].cy = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
} }
else if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_BOTTOM)
{
pSWP[i].x = vRectl.xLeft;
pSWP[i].y = vRectl.yBottom + nHeight + nHeight2;
pSWP[i].cx = vRectl.xRight - vRectl.xLeft;
pSWP[i].cy = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
}
else else
{ {
pSWP[i].x = vRectl.xLeft + nWidth; pSWP[i].x = vRectl.xLeft + nWidth;

12
src/os2/toolbar.cpp
View File

@@ -375,7 +375,7 @@ bool wxToolBar::Create( wxWindow* pParent,
int nWidth = rSize.x; int nWidth = rSize.x;
int nHeight = rSize.y; int nHeight = rSize.y;
if (lStyle & wxTB_HORIZONTAL) if (lStyle & (wxTB_HORIZONTAL | wxTB_BOTTOM))
{ {
if (nWidth <= 0) if (nWidth <= 0)
{ {
@@ -499,7 +499,7 @@ bool wxToolBar::Realize()
if (pTool->IsSeparator()) if (pTool->IsSeparator())
{ {
if (GetWindowStyleFlag() & wxTB_HORIZONTAL) if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
{ {
pTool->m_vX = m_vLastX + nSeparatorSize; pTool->m_vX = m_vLastX + nSeparatorSize;
pTool->m_vHeight = m_defaultHeight + m_vTextY; pTool->m_vHeight = m_defaultHeight + m_vTextY;
@@ -520,7 +520,7 @@ bool wxToolBar::Realize()
} }
else if (pTool->IsButton()) else if (pTool->IsButton())
{ {
if (GetWindowStyleFlag() & wxTB_HORIZONTAL) if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
{ {
if (m_nCurrentRowsOrColumns >= m_maxCols) if (m_nCurrentRowsOrColumns >= m_maxCols)
{ {
@@ -565,7 +565,7 @@ bool wxToolBar::Realize()
node = node->GetNext(); node = node->GetNext();
} }
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
m_maxWidth += nMaxToolWidth; m_maxWidth += nMaxToolWidth;
else else
m_maxHeight += nMaxToolHeight; m_maxHeight += nMaxToolHeight;
@@ -618,7 +618,7 @@ void wxToolBar::OnPaint (
vDc.SetPen(vDarkGreyPen); vDc.SetPen(vDarkGreyPen);
if (HasFlag(wxTB_TEXT)) if (HasFlag(wxTB_TEXT))
{ {
if (HasFlag(wxTB_HORIZONTAL)) if (HasFlag(wxTB_HORIZONTAL) || HasFlag(wxTB_BOTTOM))
{ {
nX = pTool->m_vX; nX = pTool->m_vX;
nY = pTool->m_vY - (m_vTextY - 6); nY = pTool->m_vY - (m_vTextY - 6);
@@ -635,7 +635,7 @@ void wxToolBar::OnPaint (
{ {
nX = pTool->m_vX; nX = pTool->m_vX;
nY = pTool->m_vY; nY = pTool->m_vY;
if (HasFlag(wxTB_HORIZONTAL)) if (HasFlag(wxTB_HORIZONTAL) || HasFlag(wxTB_BOTTOM))
nHeight = pTool->GetHeight() - 2; nHeight = pTool->GetHeight() - 2;
else else
{ {