From 4bc6f7a06c494917409bbb673526f090bc51d2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 23 Mar 2006 10:11:05 +0000 Subject: [PATCH] Warning fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/vscroll.cpp | 8 ++++++-- src/msw/mediactrl_am.cpp | 2 +- src/msw/ole/activex.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp index 1f2c1c16b1..d3eb9a3e5f 100644 --- a/src/generic/vscroll.cpp +++ b/src/generic/vscroll.cpp @@ -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); } diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index b1529a5483..52644f1bc8 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -2266,4 +2266,4 @@ FORCE_LINK_ME(wxmediabackend_am) //--------------------------------------------------------------------------- // End wxMediaCtrl Compilation Guard and this file //--------------------------------------------------------------------------- -#endif // wxUSE_MEDIACTRL \ No newline at end of file +#endif // wxUSE_MEDIACTRL diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 4b5a415e64..0c8ec070f4 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -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) ); } }