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

1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp

Browse Source 
2. wxWindow::Create() always takes a wxValidator parameter, even if
   !wxUSE_VALIDATORS - it is just ignored then, tons of #if wxUSE_VALIDATORS
   removed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-06 16:47:48 +00:00
parent a6fc8ae3c2
commit 674ac8b919
21 changed files with 71 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/tbarsmpl.cpp
View File

@@ -303,8 +303,8 @@ bool wxToolBarSimple::Realize()
m_lastX = m_xMargin;
m_lastY += maxToolHeight + m_toolPacking;
}
tool->m_x = (m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
tool->m_y = (m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
m_lastX += maxToolWidth + m_toolPacking;
}
@@ -316,8 +316,8 @@ bool wxToolBarSimple::Realize()
m_lastX += (maxToolWidth + m_toolPacking);
m_lastY = m_yMargin;
}
tool->m_x = (m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
tool->m_y = (m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
m_lastY += maxToolHeight + m_toolPacking;
}