MinGW compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -599,7 +599,13 @@ int vfwprintf(FILE *stream, const wxChar *format, va_list argptr)
|
|||||||
if ( rc != -1 )
|
if ( rc != -1 )
|
||||||
{
|
{
|
||||||
// we can't do much better without Unicode support in libc...
|
// we can't do much better without Unicode support in libc...
|
||||||
if ( fprintf(stream, "%s", s.mb_str()) == -1 )
|
if ( fprintf(stream, "%s",
|
||||||
|
#if wxUSE_UNICODE
|
||||||
|
s.mb_str().data()
|
||||||
|
#else
|
||||||
|
s.c_str()
|
||||||
|
#endif
|
||||||
|
) == -1 )
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -281,7 +281,7 @@ int wxEventLoop::Run()
|
|||||||
// wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
|
// wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
|
||||||
// something similar here)
|
// something similar here)
|
||||||
#if wxUSE_EXCEPTIONS
|
#if wxUSE_EXCEPTIONS
|
||||||
bool retryAfterException;
|
bool retryAfterException = false;
|
||||||
do {
|
do {
|
||||||
retryAfterException=false;
|
retryAfterException=false;
|
||||||
#endif
|
#endif
|
||||||
|
@@ -44,6 +44,7 @@
|
|||||||
#include "wx/volume.h"
|
#include "wx/volume.h"
|
||||||
|
|
||||||
#include <shellapi.h>
|
#include <shellapi.h>
|
||||||
|
#include <shlobj.h>
|
||||||
#include "wx/msw/missing.h"
|
#include "wx/msw/missing.h"
|
||||||
|
|
||||||
#if wxUSE_BASE
|
#if wxUSE_BASE
|
||||||
|
Reference in New Issue
Block a user