made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/mac/dirmac.cpp b/src/mac/dirmac.cpp
index e37f079382775a1b9c33eec893a53c7b5efd6290..36835cd68cb7ec10f1ed124310adb4aa51634412 100644 (file)
--- a/src/mac/dirmac.cpp
+++ b/src/mac/dirmac.cpp
@@ -36,11 +36,11 @@
 #include "wx/dir.h"
 #include "wx/filefn.h"          // for wxPathExists()
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
   #include <windows.h>
 #endif
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
+#ifndef __DARWIN__
   #include "morefile.h"
   #include "moreextr.h"
   #include "fullpath.h"
@@ -113,12 +113,12 @@ wxDirData::wxDirData(const wxString& dirname)
 
        FSSpec fsspec ;
 
-       wxUnixFilename2FSSpec( m_dirname , &fsspec ) ;
+       wxMacFilename2FSSpec( m_dirname , &fsspec ) ;
        m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
        m_CPB.hFileInfo.ioNamePtr = m_name ;
        m_index = 0 ;
 
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
        // TODO: what are we supposed to do for Mac OS X
 #else
        FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;