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());

6
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
); );
} }
@@ -711,7 +711,7 @@ void wxSplitterWindow::Initialize(wxWindow *window)
if (! window->IsShown()) if (! window->IsShown())
window->Show(); window->Show();
m_windowOne = window; m_windowOne = window;
m_windowTwo = (wxWindow *) NULL; m_windowTwo = (wxWindow *) NULL;
DoSetSashPosition(0); DoSetSashPosition(0);
@@ -737,7 +737,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
window1->Show(); window1->Show();
if (! window2->IsShown()) if (! window2->IsShown())
window2->Show(); window2->Show();
m_splitMode = mode; m_splitMode = mode;
m_windowOne = window1; m_windowOne = window1;
m_windowTwo = window2; m_windowTwo = window2;

23
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)
{ {
@@ -635,7 +636,7 @@ ArchiveTestCase<Classes>::ArchiveTestCase(
{ {
wxASSERT(m_factory.get() != NULL); wxASSERT(m_factory.get() != NULL);
} }
template <class Classes> template <class Classes>
ArchiveTestCase<Classes>::~ArchiveTestCase() ArchiveTestCase<Classes>::~ArchiveTestCase()
{ {
@@ -682,7 +683,7 @@ void ArchiveTestCase<Classes>::runTest()
ExtractArchive(in); ExtractArchive(in);
else else
ExtractArchive(in, m_unarchiver); ExtractArchive(in, m_unarchiver);
// check that all the test entries were found in the archive // check that all the test entries were found in the archive
CPPUNIT_ASSERT(m_testEntries.empty()); CPPUNIT_ASSERT(m_testEntries.empty());
} }
@@ -1060,7 +1061,7 @@ void ArchiveTestCase<Classes>::ExtractArchive(wxInputStream& in,
wxFileName fn(tmpdir.GetName()); wxFileName fn(tmpdir.GetName());
fn.SetExt(_T("arc")); fn.SetExt(_T("arc"));
wxString tmparc = fn.GetFullPath(); wxString tmparc = fn.GetFullPath();
if (m_options & Stub) if (m_options & Stub)
in.SeekI(TestOutputStream::STUB_SIZE * 2); in.SeekI(TestOutputStream::STUB_SIZE * 2);
@@ -1370,13 +1371,13 @@ public:
protected: protected:
void OnCreateArchive(wxZipOutputStream& zip); void OnCreateArchive(wxZipOutputStream& zip);
void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal); void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal);
void OnCreateEntry(wxZipOutputStream& zip, void OnCreateEntry(wxZipOutputStream& zip,
TestEntry& testEntry, TestEntry& testEntry,
wxZipEntry *entry); wxZipEntry *entry);
void OnEntryExtracted(wxZipEntry& entry, void OnEntryExtracted(wxZipEntry& entry,
const TestEntry& testEntry, const TestEntry& testEntry,
wxZipInputStream *arc); wxZipInputStream *arc);
@@ -1602,7 +1603,7 @@ ArchiveTestSuite *ArchiveTestSuite::makeSuite()
if ((options & PipeOut) && !j->empty()) if ((options & PipeOut) && !j->empty())
continue; continue;
#endif #endif
string name = Description(_T("wxZip"), options, string name = Description(_T("wxZip"), options,
genInterface != 0, *j, *i); genInterface != 0, *j, *i);
if (genInterface) if (genInterface)
@@ -1639,7 +1640,7 @@ string ArchiveTestSuite::Description(const wxString& type,
{ {
wxString descr; wxString descr;
descr << m_id << _T(" "); descr << m_id << _T(" ");
if (genericInterface) if (genericInterface)
descr << _T("wxArchive (") << type << _T(")"); descr << _T("wxArchive (") << type << _T(")");
else else
@@ -1649,7 +1650,7 @@ string ArchiveTestSuite::Description(const wxString& type,
descr << _T(" ") << archiver.BeforeFirst(_T(' ')); descr << _T(" ") << archiver.BeforeFirst(_T(' '));
if (!unarchiver.empty()) if (!unarchiver.empty())
descr << _T(" ") << unarchiver.BeforeFirst(_T(' ')); descr << _T(" ") << unarchiver.BeforeFirst(_T(' '));
wxString optstr; wxString optstr;
if ((options & PipeIn) != 0) if ((options & PipeIn) != 0)