X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b037754f53cc35e177bf6787bace26c7cecc6e1..50c319beec2454b4f669b6c8cf3d089f53c979f6:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 84c0a65c36..0a7d12ab7b 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -28,6 +28,11 @@ #include "wx/utils.h" #include +// there are just too many of those... +#ifdef _MSC_VER + #pragma warning(disable:4706) // assignment within conditional expression +#endif // VC++ + #include #include #include @@ -75,12 +80,12 @@ #define _MAXPATHLEN 500 -#if !USE_SHARED_LIBRARY +extern char *wxBuffer; + +#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) #endif -extern char *wxBuffer; - void wxPathList::Add (const wxString& path) { wxStringList::Add ((char *)(const char *)path); @@ -950,7 +955,7 @@ char *wxGetTempFileName(const wxString& prefix, char *buf) #else static short last_temp = 0; // cache last to speed things a bit // At most 1000 temp files to a process! We use a ring count. - char tmp[100]; + char tmp[100]; // FIXME static buffer for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000) { @@ -1024,7 +1029,7 @@ char *wxFindFirstFile(const char *spec, int flags) char *wxFindNextFile(void) { #ifndef __VMS__ - static char buf[400]; + static char buf[400]; // FIXME static buffer /* MATTHEW: [2] Don't crash if we read too many times */ if (!wxDirStream) @@ -1545,5 +1550,9 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) pattern++; return ((*str == '\0') && (*pattern == '\0')); }; + #endif +#ifdef _MSC_VER + #pragma warning(default:4706) // assignment within conditional expression +#endif // VC++