wxGenericDirDialog related corrections for wxMac

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

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 689de96cab87ca08ba7d30fe5c10d58801258e55..1bbeb0367ccbc8618bea95ea7b8d6c8bab3658a6 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -72,7 +72,7 @@ choicdgg.cpp  Generic
 colrdlgg.cpp   Generic Generic
 dcpsg.cpp      Generic
 dirctrlg.cpp   Generic
-dirdlgg.cpp    Generic NotWin32,NotOS2,NotMac
+dirdlgg.cpp    Generic NotWin32,NotOS2
 dragimgg.cpp   Generic NotOS2
 fdrepdlg.cpp   Generic NotMSW
 filedlgg.cpp   Generic NotMSW,NotX,NotOS2,NotMac

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index ca35534dcf8b15c5f6e43c2b8fdd1e2ea639923a..8591612324134bd927df0dee747edaff21f72645 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -56,7 +56,7 @@ bool wxDir::HasFiles(const wxString& spec)
 }
 
 // we have a (much) faster version for Unix
-#ifndef __UNIX_LIKE__
+#if !defined(__UNIX_LIKE__) || defined(__WXMAC__)
 
 bool wxDir::HasSubDirs(const wxString& spec)
 {

diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index bb7f362cf3189e5f1adf0082018d31e9fcb5601a..f29bf213256f1ceff816b1672a2a4feb1c27dfef 100644 (file)
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:59, 2002/01/01
+# This file was automatically generated by tmake at 22:53, 2002/01/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -8,6 +8,7 @@ ALL_SOURCES = \
                generic/colrdlgg.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
+               generic/dirdlgg.cpp \
                generic/dragimgg.cpp \
                generic/fdrepdlg.cpp \
                generic/fontdlgg.cpp \
@@ -768,6 +769,7 @@ GENERICOBJS = \
                colrdlgg.o \
                dcpsg.o \
                dirctrlg.o \
+               dirdlgg.o \
                dragimgg.o \
                fdrepdlg.o \
                fontdlgg.o \

diff --git a/src/mac/files.lst b/src/mac/files.lst
index bb7f362cf3189e5f1adf0082018d31e9fcb5601a..f29bf213256f1ceff816b1672a2a4feb1c27dfef 100644 (file)
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:59, 2002/01/01
+# This file was automatically generated by tmake at 22:53, 2002/01/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -8,6 +8,7 @@ ALL_SOURCES = \
                generic/colrdlgg.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
+               generic/dirdlgg.cpp \
                generic/dragimgg.cpp \
                generic/fdrepdlg.cpp \
                generic/fontdlgg.cpp \
@@ -768,6 +769,7 @@ GENERICOBJS = \
                colrdlgg.o \
                dcpsg.o \
                dirctrlg.o \
+               dirdlgg.o \
                dragimgg.o \
                fdrepdlg.o \
                fontdlgg.o \