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

build fix for wxMSW statusbar

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-12-31 13:08:12 +00:00
parent 7b6fefbed1
commit a37d94d3e1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/statusbar.cpp
View File

@@ -175,7 +175,7 @@ void wxStatusBar::SetFieldsWidth()
int *pWidths = new int[m_panes.GetCount()]; int *pWidths = new int[m_panes.GetCount()];
int nCurPos = 0; int nCurPos = 0;
for ( int i = 0; i < m_panes.GetCount(); i++ ) { for ( size_t i = 0; i < m_panes.GetCount(); i++ ) {
nCurPos += widthsAbs[i] + extraWidth; nCurPos += widthsAbs[i] + extraWidth;
pWidths[i] = nCurPos; pWidths[i] = nCurPos;
} }
@@ -189,7 +189,7 @@ void wxStatusBar::SetFieldsWidth()
void wxStatusBar::SetStatusText(const wxString& strText, int nField) void wxStatusBar::SetStatusText(const wxString& strText, int nField)
{ {
wxCHECK_RET( (nField >= 0) && (nField < m_nFields), wxCHECK_RET( (nField >= 0) && ((size_t)nField < m_panes.GetCount()),
_T("invalid statusbar field index") ); _T("invalid statusbar field index") );
if ( strText == GetStatusText(nField) ) if ( strText == GetStatusText(nField) )
@@ -225,7 +225,7 @@ void wxStatusBar::SetStatusText(const wxString& strText, int nField)
wxString wxStatusBar::GetStatusText(int nField) const wxString wxStatusBar::GetStatusText(int nField) const
{ {
wxCHECK_MSG( (nField >= 0) && (nField < m_panes.GetCount()), wxEmptyString, wxCHECK_MSG( (nField >= 0) && ((size_t)nField < m_panes.GetCount()), wxEmptyString,
_T("invalid statusbar field index") ); _T("invalid statusbar field index") );
wxString str; wxString str;
@@ -264,7 +264,7 @@ void wxStatusBar::SetMinHeight(int height)
bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const
{ {
wxCHECK_MSG( (i >= 0) && (i < m_panes.GetCount()), false, wxCHECK_MSG( (i >= 0) && ((size_t)i < m_panes.GetCount()), false,
_T("invalid statusbar field index") ); _T("invalid statusbar field index") );
RECT r; RECT r;
@@ -305,7 +305,7 @@ wxSize wxStatusBar::DoGetBestSize() const
// calculate width // calculate width
int width = 0; int width = 0;
for ( int i = 0; i < m_panes.GetCount(); ++i ) for ( size_t i = 0; i < m_panes.GetCount(); ++i )
{ {
int widthField = int widthField =
m_bSameWidthForAllPanes ? DEFAULT_FIELD_WIDTH : m_panes[i].nWidth; m_bSameWidthForAllPanes ? DEFAULT_FIELD_WIDTH : m_panes[i].nWidth;
@@ -380,7 +380,7 @@ void wxStatusBar::SetStatusStyles(int n, const int styles[])
{ {
wxStatusBarBase::SetStatusStyles(n, styles); wxStatusBarBase::SetStatusStyles(n, styles);
if (n != m_panes.GetCount()) if (n != (int)m_panes.GetCount())
return; return;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)