MinGW fixes.

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 4fe96086a7916d31357f5e060143f57828746666..ed72a22b7a74a0dfd6ee93c1acee54f35de1da50 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -460,8 +460,8 @@ void wxFileSystem::CleanUpHandlers()
     WX_CLEAR_LIST(wxList, m_Handlers);
 }
 
     WX_CLEAR_LIST(wxList, m_Handlers);
 }
 

-const static wxString g_unixPathString(wxT("/"));
-const static wxString g_nativePathString(wxFILE_SEP_PATH);
+static const wxString g_unixPathString(wxT("/"));
+static const wxString g_nativePathString(wxFILE_SEP_PATH);

 
 // Returns the native path for a file URL
 wxFileName wxFileSystem::URLToFileName(const wxString& url)
 
 // Returns the native path for a file URL
 wxFileName wxFileSystem::URLToFileName(const wxString& url)

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 902e7b8a3081a9e8bf8b615ae6935dc9c93d630f..759727e1b59ad72c02c939397633ff93eeb64d91 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -52,7 +52,8 @@ wxConnectionBase::wxConnectionBase()
 }
 
 wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)
 }
 
 wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)

-    : m_connected(copy.m_connected),
+    : wxObject(),
+      m_connected(copy.m_connected),

       m_buffer(copy.m_buffer),
       m_buffersize(copy.m_buffersize),
       m_deletebufferwhendone(false)
       m_buffer(copy.m_buffer),
       m_buffersize(copy.m_buffersize),
       m_deletebufferwhendone(false)

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index abc46f49b92603ed0bc862bff722fdbe2dde2b80..e386cfb2d579338cadcf86825973a48f32730119 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -62,7 +62,7 @@ wxURI::wxURI(const wxString& uri) : m_hostType(wxURI_REGNAME), m_fields(0)
     Create(uri);
 }
 
     Create(uri);
 }
 

-wxURI::wxURI(const wxURI& uri)  : m_hostType(wxURI_REGNAME), m_fields(0)
+wxURI::wxURI(const wxURI& uri)  : wxObject(), m_hostType(wxURI_REGNAME), m_fields(0)

 {
     Assign(uri);
 }
 {
     Assign(uri);
 }

diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index 67b52f000af3c203e9a4fdf83cd9c8d9d3d05dda..cd0d38ae2c6b0fb31a7a84455178a89a69032e30 100644 (file)
--- a/src/msw/dlmsw.cpp
+++ b/src/msw/dlmsw.cpp
@@ -262,7 +262,7 @@ void wxDynamicLibrary::Unload(wxDllType handle)
 /* static */
 void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
 {
 /* static */
 void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
 {

-    return ::GetProcAddress(handle, name.ToAscii());
+    return (void *)::GetProcAddress(handle, name.ToAscii());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index 3872361952975c2376665fd5596b144b3ad16af2..d1ee80996768848f9c830361da8b30b38a297991 100644 (file)
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -25,6 +25,10 @@
 
 #if wxUSE_STACKWALKER
 
 
 #if wxUSE_STACKWALKER
 

+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+

 #include "wx/stackwalk.h"
 
 #include "wx/msw/debughlp.h"
 #include "wx/stackwalk.h"
 
 #include "wx/msw/debughlp.h"


@@ -164,7 +168,7 @@ EnumSymbolsProc(PSYMBOL_INFO pSymInfo, ULONG WXUNUSED(SymSize), PVOID data)
     {
         frame->OnParam(pSymInfo);
     }
     {
         frame->OnParam(pSymInfo);
     }

-    
+

     // return true to continue enumeration, false would have stopped it
     return TRUE;
 }
     // return true to continue enumeration, false would have stopped it
     return TRUE;
 }