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

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 0d5b0a4ae3132ede1a8a2547516dff0f1b1db0f6..a4cefd642a0ab7823f120543afbbbda280fdeace 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -199,19 +199,7 @@ wxString wxFileConfig::GetGlobalDir()
   #elif defined(__WXSTUBS__)
     wxASSERT_MSG( FALSE, wxT("TODO") ) ;
   #elif defined(__WXMAC__)
   #elif defined(__WXSTUBS__)
     wxASSERT_MSG( FALSE, wxT("TODO") ) ;
   #elif defined(__WXMAC__)

-  {
-               short           vRefNum  ;
-               long            dirID ;
-               
-               if ( FindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder, &vRefNum, &dirID) == noErr)
-               {
-                       FSSpec file ;
-                       if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
-                       {
-                               strDir = wxMacFSSpec2UnixFilename( &file ) + "/" ;
-                       }
-               }
-  }
+       strDir = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;

   #else // Windows
     wxChar szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);
   #else // Windows
     wxChar szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);


@@ -809,12 +797,12 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 
   bool ret = file.Commit();
 
 
   bool ret = file.Commit();
 

-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)

   if ( ret )
   {
        FSSpec spec ;
        
   if ( ret )
   {
        FSSpec spec ;
        

-       wxUnixFilename2FSSpec( m_strLocalFile , &spec ) ;
+       wxMacFilename2FSSpec( m_strLocalFile , &spec ) ;

        FInfo finfo ;
        if ( FSpGetFInfo( &spec , &finfo ) == noErr )
        {
        FInfo finfo ;
        if ( FSpGetFInfo( &spec , &finfo ) == noErr )
        {


@@ -823,7 +811,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
                FSpSetFInfo( &spec , &finfo ) ;
        }
   }
                FSpSetFInfo( &spec , &finfo ) ;
        }
   }

-#endif // __WXMAC__
+#endif // __WXMAC__ && !__UNIX__

 
 #ifdef __UNIX__
   // restore the old umask if we changed it
 
 #ifdef __UNIX__
   // restore the old umask if we changed it