1. added wxTreeCtrl::DeleteChildren()

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 84c0a65c36523760df4309d22dda2e8662a0fdcd..0a86781a020460a9a4171240231fb5184a44fa20 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -28,6 +28,11 @@
 #include "wx/utils.h"
 #include <wx/intl.h>
 
+// there are just too many of those...
+#ifdef _MSC_VER
+    #pragma warning(disable:4706)   // assignment within conditional expression
+#endif // VC++
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -65,7 +70,8 @@
 #endif
 
 #include "wx/setup.h"
-#ifdef HAVE_FNMATCH_H
+
+#if defined(HAVE_FNMATCH_H) || defined(__GNUWIN32__)
 #include   "fnmatch.h"
 #endif
 
@@ -75,12 +81,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 +956,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 +1030,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)
@@ -1399,7 +1405,8 @@ bool wxIsWild( const wxString& pattern )
 };
 
 bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
-#ifdef HAVE_FNMATCH_H
+
+#if defined(HAVE_FNMATCH_H) || defined(__GNUWIN32__)
 {
    if(dot_special)
       return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;
@@ -1545,5 +1552,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++