From 8766aa0948d1936c1d1d01bab1deeebf0404e837 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 21 Oct 2001 23:02:37 +0000 Subject: [PATCH] Correction for wxFileConfig where UNIX was taken instead of MAC where both aredfined in wxMac. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fileconf.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index 0cb93cf513..32f6cd69d8 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -256,6 +256,8 @@ wxString wxFileConfig::GetGlobalDir() #ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined strDir = wxT("sys$manager:"); + #elif defined(__WXMAC__) + strDir = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ; #elif defined( __UNIX__ ) strDir = wxT("/etc/"); #elif defined(__WXPM__) @@ -351,8 +353,6 @@ wxString wxFileConfig::GetGlobalDir() } #elif defined(__WXSTUBS__) wxASSERT_MSG( FALSE, wxT("TODO") ) ; - #elif defined(__WXMAC__) - strDir = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ; #else // Windows wxChar szWinDir[MAX_PATH]; ::GetWindowsDirectory(szWinDir, MAX_PATH); -- 2.45.2