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

Toolbar fixes and weekly catch-up.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-08 18:23:33 +00:00
parent 58c1c0965e
commit 97d74dd295
5 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/os2/toolbar.cpp
View File

@@ -827,22 +827,39 @@ void wxToolBar::OnPaint (
);
int nX;
int nY;
int nHeight;
int nHeight = 0;
int nWidth = 0;
vDc.SetPen(vDarkGreyPen);
if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
if (HasFlag(wxTB_TEXT))
{
nX = pTool->m_vX;
nY = pTool->m_vY - (m_vTextY - 6);
nHeight = (m_vTextY - 2) + pTool->GetHeight();
if (HasFlag(wxTB_HORIZONTAL))
{
nX = pTool->m_vX;
nY = pTool->m_vY - (m_vTextY - 6);
nHeight = (m_vTextY - 2) + pTool->GetHeight();
}
else
{
nX = pTool->m_vX + m_xMargin + 10;
nY = pTool->m_vY + m_vTextY + m_toolSeparation;
nWidth = pTool->GetWidth() > m_vTextX ? pTool->GetWidth() : m_vTextX;
}
}
else
{
nX = pTool->m_vX;
nY = pTool->m_vY;
nHeight = pTool->GetHeight() - 2;
if (HasFlag(wxTB_HORIZONTAL))
nHeight = pTool->GetHeight() - 2;
else
{
nX += m_xMargin + 10;
nY += m_yMargin + m_toolSeparation;
nWidth = pTool->GetWidth();
}
}
vDc.DrawLine(nX, nY, nX, nY + nHeight);
vDc.DrawLine(nX, nY, nX + nWidth, nY + nHeight);
}
}
nCount--;