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
This commit is contained in:
@@ -256,6 +256,8 @@ wxString wxFileConfig::GetGlobalDir()
|
|||||||
|
|
||||||
#ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
|
#ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
|
||||||
strDir = wxT("sys$manager:");
|
strDir = wxT("sys$manager:");
|
||||||
|
#elif defined(__WXMAC__)
|
||||||
|
strDir = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
|
||||||
#elif defined( __UNIX__ )
|
#elif defined( __UNIX__ )
|
||||||
strDir = wxT("/etc/");
|
strDir = wxT("/etc/");
|
||||||
#elif defined(__WXPM__)
|
#elif defined(__WXPM__)
|
||||||
@@ -351,8 +353,6 @@ wxString wxFileConfig::GetGlobalDir()
|
|||||||
}
|
}
|
||||||
#elif defined(__WXSTUBS__)
|
#elif defined(__WXSTUBS__)
|
||||||
wxASSERT_MSG( FALSE, wxT("TODO") ) ;
|
wxASSERT_MSG( FALSE, wxT("TODO") ) ;
|
||||||
#elif defined(__WXMAC__)
|
|
||||||
strDir = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
|
|
||||||
#else // Windows
|
#else // Windows
|
||||||
wxChar szWinDir[MAX_PATH];
|
wxChar szWinDir[MAX_PATH];
|
||||||
::GetWindowsDirectory(szWinDir, MAX_PATH);
|
::GetWindowsDirectory(szWinDir, MAX_PATH);
|
||||||
|
Reference in New Issue
Block a user