MinGW warning fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index a30c4f14bbcae183bfa307db5698b8e873e57d2d..3920675618376c3ecaff03f1a10d3067eb3d2846 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -226,7 +226,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 
             // remember the alt encoding for this charset -- or remember that
             // we don't know it
 
             // remember the alt encoding for this charset -- or remember that
             // 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) )
             {
                 wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());
             if ( !config->Write(charset, value) )
             {
                 wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 54e664c2adc5ebffc7f9ae12910e0fbee7d774f2..6052fd67d8b138cf52a5f5c69a7a73c479c6a598 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -502,7 +502,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
                                 m_sashPosition,
                                 m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
                                                                 : wxHORIZONTAL,
                                 m_sashPosition,
                                 m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
                                                                 : wxHORIZONTAL,

-                                m_isHot ? wxCONTROL_CURRENT : 0
+                                m_isHot ? (int)wxCONTROL_CURRENT : 0

                             );
 }
 
                             );
 }
 


@@ -711,7 +711,7 @@ void wxSplitterWindow::Initialize(wxWindow *window)
 
     if (! window->IsShown())
         window->Show();
 
     if (! window->IsShown())
         window->Show();

-    
+

     m_windowOne = window;
     m_windowTwo = (wxWindow *) NULL;
     DoSetSashPosition(0);
     m_windowOne = window;
     m_windowTwo = (wxWindow *) NULL;
     DoSetSashPosition(0);


@@ -737,7 +737,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
         window1->Show();
     if (! window2->IsShown())
         window2->Show();
         window1->Show();
     if (! window2->IsShown())
         window2->Show();

-    
+

     m_splitMode = mode;
     m_windowOne = window1;
     m_windowTwo = window2;
     m_splitMode = mode;
     m_windowOne = window1;
     m_windowTwo = window2;

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index b6b20c7aca5903dec03c4bec42a4e4b404f1e1cf..5a3a10aafd795ba5f402688b050fad0c5909f999 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -231,7 +231,7 @@ size_t TestOutputStream::OnSysWrite(const void *buffer, size_t size)
     wxCHECK(newsize > m_pos, 0);
 
     if (m_capacity < newsize) {
     wxCHECK(newsize > m_pos, 0);
 
     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) {
             capacity <<= 1;
 
         while (capacity < newsize) {
             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_size(in.m_size)
 {
     m_pos(in.m_pos),
     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>
 ArchiveTestCase<Classes>::~ArchiveTestCase()
 {
 template <class Classes>
 ArchiveTestCase<Classes>::~ArchiveTestCase()
 {


@@ -682,7 +683,7 @@ void ArchiveTestCase<Classes>::runTest()
         ExtractArchive(in);
     else
         ExtractArchive(in, m_unarchiver);
         ExtractArchive(in);
     else
         ExtractArchive(in, m_unarchiver);

-    
+

     // check that all the test entries were found in the archive
     CPPUNIT_ASSERT(m_testEntries.empty());
 }
     // check that all the test entries were found in the archive
     CPPUNIT_ASSERT(m_testEntries.empty());
 }


@@ -1060,7 +1061,7 @@ void ArchiveTestCase<Classes>::ExtractArchive(wxInputStream& in,
         wxFileName fn(tmpdir.GetName());
         fn.SetExt(_T("arc"));
         wxString tmparc = fn.GetFullPath();
         wxFileName fn(tmpdir.GetName());
         fn.SetExt(_T("arc"));
         wxString tmparc = fn.GetFullPath();

-        
+

         if (m_options & Stub)
             in.SeekI(TestOutputStream::STUB_SIZE * 2);
 
         if (m_options & Stub)
             in.SeekI(TestOutputStream::STUB_SIZE * 2);
 


@@ -1370,13 +1371,13 @@ public:
 
 protected:
     void OnCreateArchive(wxZipOutputStream& zip);
 
 protected:
     void OnCreateArchive(wxZipOutputStream& zip);

-    
+

     void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal);
     void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal);

-    
+

     void OnCreateEntry(wxZipOutputStream& zip,
                        TestEntry& testEntry,
                        wxZipEntry *entry);
     void OnCreateEntry(wxZipOutputStream& zip,
                        TestEntry& testEntry,
                        wxZipEntry *entry);

-    
+

     void OnEntryExtracted(wxZipEntry& entry,
                           const TestEntry& testEntry,
                           wxZipInputStream *arc);
     void OnEntryExtracted(wxZipEntry& entry,
                           const TestEntry& testEntry,
                           wxZipInputStream *arc);


@@ -1602,7 +1603,7 @@ ArchiveTestSuite *ArchiveTestSuite::makeSuite()
                     if ((options & PipeOut) && !j->empty())
                         continue;
 #endif
                     if ((options & PipeOut) && !j->empty())
                         continue;
 #endif

-                    string name = Description(_T("wxZip"), options, 
+                    string name = Description(_T("wxZip"), options,

                                               genInterface != 0, *j, *i);
 
                     if (genInterface)
                                               genInterface != 0, *j, *i);
 
                     if (genInterface)


@@ -1639,7 +1640,7 @@ string ArchiveTestSuite::Description(const wxString& type,
 {
     wxString descr;
     descr << m_id << _T(" ");
 {
     wxString descr;
     descr << m_id << _T(" ");

-    
+

     if (genericInterface)
         descr << _T("wxArchive (") << type << _T(")");
     else
     if (genericInterface)
         descr << _T("wxArchive (") << type << _T(")");
     else


@@ -1649,7 +1650,7 @@ string ArchiveTestSuite::Description(const wxString& type,
         descr << _T(" ") << archiver.BeforeFirst(_T(' '));
     if (!unarchiver.empty())
         descr << _T(" ") << unarchiver.BeforeFirst(_T(' '));
         descr << _T(" ") << archiver.BeforeFirst(_T(' '));
     if (!unarchiver.empty())
         descr << _T(" ") << unarchiver.BeforeFirst(_T(' '));

-    
+

     wxString optstr;
 
     if ((options & PipeIn) != 0)
     wxString optstr;
 
     if ((options & PipeIn) != 0)