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

Applied toolbar patch for wxTB_RIGHT support (patch #1595081).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-11-12 16:06:07 +00:00
parent 219b657fbe
commit 9ffdd8cf3c
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/os2/frame.cpp
View File

@@ -695,7 +695,7 @@ void wxFrame::PositionToolBar()
,&vTHeight ,&vTHeight
); );
if (pToolBar->GetWindowStyleFlag() & wxTB_HORIZONTAL) if (pToolBar->GetWindowStyleFlag() & wxTB_TOP)
{ {
vWidth = (wxCoord)(vRect.xRight - vRect.xLeft); vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
pToolBar->SetSize( vRect.xLeft - vFRect.xLeft pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
@@ -720,6 +720,22 @@ void wxFrame::PositionToolBar()
,vTHeight ,vTHeight
); );
} }
else if (pToolBar->GetWindowStyleFlag() & wxTB_LEFT)
{
wxCoord vSwidth = 0;
wxCoord vSheight = 0;
if (m_frameStatusBar)
m_frameStatusBar->GetSize( &vSwidth
,&vSheight
);
vHeight = (wxCoord)(vRect.yTop - vRect.yBottom);
pToolBar->SetSize( vRect.xLeft - vRect.xLeft
,vPos.y
,vTWidth
,vHeight - vSheight
);
}
else else
{ {
wxCoord vSwidth = 0; wxCoord vSwidth = 0;
@@ -730,7 +746,7 @@ void wxFrame::PositionToolBar()
,&vSheight ,&vSheight
); );
vHeight = (wxCoord)(vRect.yTop - vRect.yBottom); vHeight = (wxCoord)(vRect.yTop - vRect.yBottom);
pToolBar->SetSize( vRect.xLeft - vFRect.xLeft pToolBar->SetSize( vRect.xRight - vFRect.xLeft - vTWidth
,vPos.y ,vPos.y
,vTWidth ,vTWidth
,vHeight - vSheight ,vHeight - vSheight
@@ -1108,7 +1124,7 @@ MRESULT EXPENTRY wxFrameMainWndProc( HWND hWnd,
{ {
if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd) if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd)
{ {
if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_HORIZONTAL) if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_TOP)
{ {
pSWP[i].x = vRectl.xLeft; pSWP[i].x = vRectl.xLeft;
pSWP[i].y = vRectl.yBottom + nHeight; pSWP[i].y = vRectl.yBottom + nHeight;
@@ -1122,13 +1138,20 @@ 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 else if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_LEFT)
{ {
pSWP[i].x = vRectl.xLeft + nWidth; pSWP[i].x = vRectl.xLeft + nWidth;
pSWP[i].y = vRectl.yBottom + nHeight; pSWP[i].y = vRectl.yBottom + nHeight;
pSWP[i].cx = vRectl.xRight - (vRectl.xLeft + nWidth); pSWP[i].cx = vRectl.xRight - (vRectl.xLeft + nWidth);
pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight; pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight;
} }
else
{
pSWP[i].x = vRectl.xLeft;
pSWP[i].y = vRectl.yBottom + nHeight;
pSWP[i].cx = vRectl.xRight - (vRectl.xLeft + nWidth);
pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight;
}
pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW; pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
pSWP[i].hwndInsertBehind = HWND_TOP; pSWP[i].hwndInsertBehind = HWND_TOP;
} }

14
src/os2/toolbar.cpp
View File

@@ -333,7 +333,7 @@ bool wxToolBar::Create( wxWindow* pParent,
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR)); SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
SetFont(*wxSMALL_FONT); SetFont(*wxSMALL_FONT);
if (GetWindowStyleFlag() & wxTB_VERTICAL) if (GetWindowStyleFlag() & (wxTB_LEFT | wxTB_RIGHT))
{ {
m_vLastX = 7; m_vLastX = 7;
m_vLastY = 3; m_vLastY = 3;
@@ -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 | wxTB_BOTTOM)) if (lStyle & (wxTB_TOP | 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 | wxTB_BOTTOM)) if (GetWindowStyleFlag() & (wxTB_TOP | 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 | wxTB_BOTTOM)) if (GetWindowStyleFlag() & (wxTB_TOP | 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 | wxTB_BOTTOM)) if (GetWindowStyleFlag() & (wxTB_TOP | 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) || HasFlag(wxTB_BOTTOM)) if (HasFlag(wxTB_TOP) || 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) || HasFlag(wxTB_BOTTOM)) if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM))
nHeight = pTool->GetHeight() - 2; nHeight = pTool->GetHeight() - 2;
else else
{ {