Re-added corrupt binary files; small change to filefn.cpp for Cygwin.

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

diff --git a/include/wx/msw/child.ico b/include/wx/msw/child.ico
new file mode 100644 (file)
index 0000000..00c8d8b
Binary files /dev/null and b/include/wx/msw/child.ico differ

diff --git a/include/wx/msw/mdi.ico b/include/wx/msw/mdi.ico
new file mode 100644 (file)
index 0000000..00c8d8b
Binary files /dev/null and b/include/wx/msw/mdi.ico differ

diff --git a/include/wx/msw/std.ico b/include/wx/msw/std.ico
new file mode 100644 (file)
index 0000000..00c8d8b
Binary files /dev/null and b/include/wx/msw/std.ico differ

diff --git a/samples/internat/internat.mo b/samples/internat/internat.mo
new file mode 100644 (file)
index 0000000..a710101
Binary files /dev/null and b/samples/internat/internat.mo differ

diff --git a/samples/internat/wxstd.mo b/samples/internat/wxstd.mo
new file mode 100644 (file)
index 0000000..a03f3d8
Binary files /dev/null and b/samples/internat/wxstd.mo differ

diff --git a/samples/png/julian.png b/samples/png/julian.png
new file mode 100644 (file)
index 0000000..9e875e0
Binary files /dev/null and b/samples/png/julian.png differ

diff --git a/samples/png/paint.png b/samples/png/paint.png
new file mode 100644 (file)
index 0000000..a2f4db0
Binary files /dev/null and b/samples/png/paint.png differ

diff --git a/samples/png/paint16.png b/samples/png/paint16.png
new file mode 100644 (file)
index 0000000..c977483
Binary files /dev/null and b/samples/png/paint16.png differ

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 0a7d12ab7bbb36ea96d814a9a53672bf23ecd53a..0a86781a020460a9a4171240231fb5184a44fa20 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -70,7 +70,8 @@
 #endif
 
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"

-#ifdef HAVE_FNMATCH_H
+
+#if defined(HAVE_FNMATCH_H) || defined(__GNUWIN32__)

 #include   "fnmatch.h"
 #endif
 
 #include   "fnmatch.h"
 #endif
 


@@ -1404,7 +1405,8 @@ bool wxIsWild( const wxString& pattern )
 };
 
 bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 };
 
 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;
 {
    if(dot_special)
       return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;