added and documented wxDir::HasFiles/SubDirs(), use the latter in wxDirDialog - it...

[wxWidgets.git] / src / mac / morefile / mfsearch.cpp

diff --git a/src/mac/morefile/mfsearch.cpp b/src/mac/morefile/mfsearch.cpp
index 8bdba2716b54dee711bc05d7d71c5268f06ad89b..6aed9b934d014168cdbd728badd6eda0c9abfbb8 100644 (file)
--- a/src/mac/morefile/mfsearch.cpp
+++ b/src/mac/morefile/mfsearch.cpp
@@ -791,7 +791,11 @@ pascal     OSErr   IndexedSearch(CSParamPtr pb,
        if ( pb->ioSearchTime != 0 )
        {
                /* Start timer */
        if ( pb->ioSearchTime != 0 )
        {
                /* Start timer */

+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
+               timerTask.theTask.tmAddr = NewTimerUPP(TimeOutTask);
+#else

                timerTask.theTask.tmAddr = NewTimerProc(TimeOutTask);
                timerTask.theTask.tmAddr = NewTimerProc(TimeOutTask);

+#endif

                InsTime((QElemPtr)&(timerTask.theTask));
                PrimeTime((QElemPtr)&(timerTask.theTask), pb->ioSearchTime);
        }
                InsTime((QElemPtr)&(timerTask.theTask));
                PrimeTime((QElemPtr)&(timerTask.theTask), pb->ioSearchTime);
        }