From 99cc00edee69232187de18fa48e39368fdae678b Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 17 Dec 1998 09:44:29 +0000 Subject: [PATCH] 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 --- include/wx/msw/child.ico | Bin 0 -> 766 bytes include/wx/msw/mdi.ico | Bin 0 -> 766 bytes include/wx/msw/std.ico | Bin 0 -> 766 bytes samples/internat/internat.mo | Bin 0 -> 403 bytes samples/internat/wxstd.mo | Bin 0 -> 1868 bytes samples/png/julian.png | Bin 0 -> 5439 bytes samples/png/paint.png | Bin 0 -> 950 bytes samples/png/paint16.png | Bin 0 -> 236 bytes src/common/filefn.cpp | 6 ++++-- 9 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 include/wx/msw/child.ico create mode 100644 include/wx/msw/mdi.ico create mode 100644 include/wx/msw/std.ico create mode 100644 samples/internat/internat.mo create mode 100644 samples/internat/wxstd.mo create mode 100644 samples/png/julian.png create mode 100644 samples/png/paint.png create mode 100644 samples/png/paint16.png diff --git a/include/wx/msw/child.ico b/include/wx/msw/child.ico new file mode 100644 index 0000000000000000000000000000000000000000..00c8d8b8a4c243143ecca37973cbc13ea97484a2 GIT binary patch literal 766 zcmchUJ#K_B5JqRCNGRTwoGLYCj*%nLZOak1r2%SJ^e*5AzCy~-Slqz-2D7YIiMGrK zV|e~N<3EuDPg%Z;>gPq|gYPF%5?{nYUTG2D-x@`DWgPQ|mS35sN$R@BNb4&p=^w$P zT{JQ4`{=WNbJI3$%>LkgoExMp-Va9~6>m)6oweSOId1unJjf&8$M5yXpPQKHXFjbT z<4kPpVSc#Xnf0OO#$+g?eSd8KsW=nWVq8{AHnS-AlC0H^#S{iEDoE^N7t>eRXJb=1 z2|dO!pr~95uvhLYY!^a0O)I+s+lAE0#%jCN!Gn$`8^7!H#@76^&e^5#c5!R{ijrDC i^O{{4>dU3a*WwHatd*Nyj8M@zy>r#Rzo&=s59SqGV?PG~ literal 0 HcmV?d00001 diff --git a/include/wx/msw/mdi.ico b/include/wx/msw/mdi.ico new file mode 100644 index 0000000000000000000000000000000000000000..00c8d8b8a4c243143ecca37973cbc13ea97484a2 GIT binary patch literal 766 zcmchUJ#K_B5JqRCNGRTwoGLYCj*%nLZOak1r2%SJ^e*5AzCy~-Slqz-2D7YIiMGrK zV|e~N<3EuDPg%Z;>gPq|gYPF%5?{nYUTG2D-x@`DWgPQ|mS35sN$R@BNb4&p=^w$P zT{JQ4`{=WNbJI3$%>LkgoExMp-Va9~6>m)6oweSOId1unJjf&8$M5yXpPQKHXFjbT z<4kPpVSc#Xnf0OO#$+g?eSd8KsW=nWVq8{AHnS-AlC0H^#S{iEDoE^N7t>eRXJb=1 z2|dO!pr~95uvhLYY!^a0O)I+s+lAE0#%jCN!Gn$`8^7!H#@76^&e^5#c5!R{ijrDC i^O{{4>dU3a*WwHatd*Nyj8M@zy>r#Rzo&=s59SqGV?PG~ literal 0 HcmV?d00001 diff --git a/include/wx/msw/std.ico b/include/wx/msw/std.ico new file mode 100644 index 0000000000000000000000000000000000000000..00c8d8b8a4c243143ecca37973cbc13ea97484a2 GIT binary patch literal 766 zcmchUJ#K_B5JqRCNGRTwoGLYCj*%nLZOak1r2%SJ^e*5AzCy~-Slqz-2D7YIiMGrK zV|e~N<3EuDPg%Z;>gPq|gYPF%5?{nYUTG2D-x@`DWgPQ|mS35sN$R@BNb4&p=^w$P zT{JQ4`{=WNbJI3$%>LkgoExMp-Va9~6>m)6oweSOId1unJjf&8$M5yXpPQKHXFjbT z<4kPpVSc#Xnf0OO#$+g?eSd8KsW=nWVq8{AHnS-AlC0H^#S{iEDoE^N7t>eRXJb=1 z2|dO!pr~95uvhLYY!^a0O)I+s+lAE0#%jCN!Gn$`8^7!H#@76^&e^5#c5!R{ijrDC i^O{{4>dU3a*WwHatd*Nyj8M@zy>r#Rzo&=s59SqGV?PG~ literal 0 HcmV?d00001 diff --git a/samples/internat/internat.mo b/samples/internat/internat.mo new file mode 100644 index 0000000000000000000000000000000000000000..a710101f4b57cc4ba90b17afef42e538df862ae4 GIT binary patch literal 403 zcmYMuJx&8L5CvcZ;Q|q&0%=m9NE9v+ilWqST4W`xDI#V0-S_` zmyn2&KfS^p>wQlr9|kjlD_FugJi;aPa0l-&g-^JJFCh4Vd$>L^<^s7!&XF4=&i>z1 z|k&xvXw*Rnd9k)*_ literal 0 HcmV?d00001 diff --git a/samples/internat/wxstd.mo b/samples/internat/wxstd.mo new file mode 100644 index 0000000000000000000000000000000000000000..a03f3d877f509d79160ccd7cb8542e8b6d5a446d GIT binary patch literal 1868 zcmbW1ziSjh6vs!6QRDAuK#0oI)Dv$3%BKM-te zQ`(tUu(nbJEk(;~?CdQ3&g|VKIg^~YFnn%q-@NzcJKx!FlVh(Kp3@j-G2UUE!&uqF z*a`3xI1By&XTb5jj2!^4^mq+CiunR~5?lrkfseuSpa8FeFM9KJa31r|V5rIVF?JD{ z0tvhYUH~6~3HThG2G_tF;CrwE{sKe2=`qHd;5-=KuYjSym*7G0HFz9c1E;`s@G$rR zyaav$?}NX=(AUy_#_oU?oB`j0;s3ATO>k_Su{rQIxCCZkh}6gEUdsW8f)_&`WqAN9-5N2T#;zFst{4HscdCpTG!v3pz|=#B18Z{2OX4kKy%fy}_K;hxbXbvcop?$M<7Ay!NS9jG@u5%Adz~pQ zsE|7MZ8BLMXL^ln8(&ney>q%;dU8@erH*mRD`eU&nd!)0sUTOcBP+R}%$joNDzUoeFs&NgzVeO)h_G1Drg^8WW0jQNO0|N&e(O@ zRuah_eW!xMX8B(}L-E>hp^Gf|O>S7NlrS6D!f4%v-4?x6dc;DJ{(ah3hqTRgUh6Pu=^r}j;zpy)=tx|LzS4s) z(2##RedXeXsIA`|IxZLx->l%BjqA~5X#OW`R9~TlN1Jwiw=UTon6JJay|{k0|4FoE F%^y^S0z&`* literal 0 HcmV?d00001 diff --git a/samples/png/julian.png b/samples/png/julian.png new file mode 100644 index 0000000000000000000000000000000000000000..9e875e0a1fa2a4584b3cf7e9ad98648880029852 GIT binary patch literal 5439 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 literal 0 HcmV?d00001 diff --git a/samples/png/paint16.png b/samples/png/paint16.png new file mode 100644 index 0000000000000000000000000000000000000000..c977483485cf039be2c1721050da100f5dd72747 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^5EaktaVzwKAz!nBfXl^~X6&1%yuQ%8JHX|Z zZQiaaDYj-C7#qKQF%@EaQmZ(hmvve>BbU{iw&eXE6b|`WT)h8Qvt-|a4Bvvf1TTq) zv)^+*pSWAV?L_RFMFM8#T-L2Jy&EowioH;t6Y${AoH_ghiCZt3r`do~4f R(m*FLc)I$ztaD0e0suKsS~LIv literal 0 HcmV?d00001 diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 0a7d12ab7b..0a86781a02 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -70,7 +70,8 @@ #endif #include "wx/setup.h" -#ifdef HAVE_FNMATCH_H + +#if defined(HAVE_FNMATCH_H) || defined(__GNUWIN32__) #include "fnmatch.h" #endif @@ -1404,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; -- 2.47.2