From 60431236a330a9f3f1d071719e818812820b4d0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 17 Jan 2005 19:08:44 +0000 Subject: [PATCH] MinGW fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filesys.cpp | 4 ++-- src/common/ipcbase.cpp | 3 ++- src/common/uri.cpp | 2 +- src/msw/dlmsw.cpp | 2 +- src/msw/stackwalk.cpp | 6 +++++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 4fe96086a7..ed72a22b7a 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -460,8 +460,8 @@ void wxFileSystem::CleanUpHandlers() 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) diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp index 902e7b8a30..759727e1b5 100644 --- a/src/common/ipcbase.cpp +++ b/src/common/ipcbase.cpp @@ -52,7 +52,8 @@ wxConnectionBase::wxConnectionBase() } 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) diff --git a/src/common/uri.cpp b/src/common/uri.cpp index abc46f49b9..e386cfb2d5 100644 --- 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); } -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); } diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp index 67b52f000a..cd0d38ae2c 100644 --- 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) { - return ::GetProcAddress(handle, name.ToAscii()); + return (void *)::GetProcAddress(handle, name.ToAscii()); } // ---------------------------------------------------------------------------- diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp index 3872361952..d1ee809967 100644 --- a/src/msw/stackwalk.cpp +++ b/src/msw/stackwalk.cpp @@ -25,6 +25,10 @@ #if wxUSE_STACKWALKER +#ifndef WX_PRECOMP + #include "wx/string.h" +#endif + #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); } - + // return true to continue enumeration, false would have stopped it return TRUE; } -- 2.45.2