fix for 10.2 (persistent tooltips ;-)

[wxWidgets.git] / src / mac / dirmac.cpp

diff --git a/src/mac/dirmac.cpp b/src/mac/dirmac.cpp
index 729be9473d485e1699b8fb4c09169bc19040e297..0ccaf0b8e953dc4029c279023ba179d12e627803 100644 (file)
--- a/src/mac/dirmac.cpp
+++ b/src/mac/dirmac.cpp
@@ -118,7 +118,8 @@ wxDirData::wxDirData(const wxString& dirname)
        m_CPB.hFileInfo.ioNamePtr = m_name ;
        m_index = 0 ;
 
-       FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;
+       OSErr err = FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;
+        wxASSERT_MSG( err == noErr , "Error accessing directory") ;
 }
 
 wxDirData::~wxDirData()
@@ -156,6 +157,11 @@ bool wxDirData::Read(wxString *filename)
                strcpy( (char *)m_name, c_name);
 #else
                p2cstr( m_name ) ;
+#endif
+#if TARGET_CARBON
+                // under X thats the way the mounting points look like
+                if ( ( m_CPB.dirInfo.ioDrDirID == 0 ) && ( m_flags & wxDIR_DIRS) )
+                        break ;
 #endif
                if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (m_flags & wxDIR_DIRS) ) //  we have a directory
                        break ;