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

Warning fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-03-23 10:11:05 +00:00
parent bb2955b339
commit 4bc6f7a06c
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/vscroll.cpp
View File

@ -772,16 +772,20 @@ void wxHVScrolledWindow::SetRowColumnCounts(size_t rowCount, size_t columnCount)
// recalculate the scrollbars parameters
if(m_rowsFirst >= rowCount)
m_rowsFirst = rowCount-1;
m_rowsFirst = (rowCount > 0) ? rowCount - 1 : 0;
if(m_columnsFirst >= columnCount)
m_columnsFirst = columnCount-1;
m_columnsFirst = (columnCount > 0) ? columnCount - 1 : 0;
#if 0
// checks disabled due to size_t type of members
// but leave them here if anyone would want to do some debugging
if(m_rowsFirst < 0)
m_rowsFirst = 0;
if(m_columnsFirst < 0)
m_columnsFirst = 0;
#endif
ScrollToRowColumn(m_rowsFirst, m_columnsFirst);
}

2
src/msw/mediactrl_am.cpp
View File

@ -2266,4 +2266,4 @@ FORCE_LINK_ME(wxmediabackend_am)
//---------------------------------------------------------------------------
// End wxMediaCtrl Compilation Guard and this file
//---------------------------------------------------------------------------
#endif // wxUSE_MEDIACTRL
#endif // wxUSE_MEDIACTRL

2
src/msw/ole/activex.cpp
View File

@ -946,7 +946,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
hret = cp->Advise(new wxActiveXEvents(this, ta->guid),
&adviseCookie);
wxASSERT_MSG( SUCCEEDED(hret),
wxString::Format(wxT("Cannot connect!\nHRESULT:%X"), hret)
wxString::Format(wxT("Cannot connect!\nHRESULT:%X"), (unsigned int)hret)
);
}
}