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

MinGW warning fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-18 19:50:43 +00:00
parent cd2e10d695
commit a09cd1895e
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/fontmap.cpp
View File

@@ -226,7 +226,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
// remember the alt encoding for this charset -- or remember that // remember the alt encoding for this charset -- or remember that
// we don't know it // we don't know it
long value = n == -1 ? wxFONTENCODING_UNKNOWN : (long)encoding; long value = n == -1 ? (long)wxFONTENCODING_UNKNOWN : (long)encoding;
if ( !config->Write(charset, value) ) if ( !config->Write(charset, value) )
{ {
wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str()); wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());

2
src/generic/splitter.cpp
View File

@@ -502,7 +502,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
m_sashPosition, m_sashPosition,
m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
: wxHORIZONTAL, : wxHORIZONTAL,
m_isHot ? wxCONTROL_CURRENT : 0 m_isHot ? (int)wxCONTROL_CURRENT : 0
); );
} }

5
tests/archive/archivetest.cpp
View File

@@ -231,7 +231,7 @@ size_t TestOutputStream::OnSysWrite(const void *buffer, size_t size)
wxCHECK(newsize > m_pos, 0); wxCHECK(newsize > m_pos, 0);
if (m_capacity < newsize) { if (m_capacity < newsize) {
size_t capacity = m_capacity ? m_capacity : INITIAL_SIZE; size_t capacity = m_capacity ? m_capacity : (size_t)INITIAL_SIZE;
while (capacity < newsize) { while (capacity < newsize) {
capacity <<= 1; capacity <<= 1;
@@ -306,7 +306,8 @@ private:
}; };
TestInputStream::TestInputStream(const TestInputStream& in) TestInputStream::TestInputStream(const TestInputStream& in)
: m_options(in.m_options), : wxInputStream(),
m_options(in.m_options),
m_pos(in.m_pos), m_pos(in.m_pos),
m_size(in.m_size) m_size(in.m_size)
{ {