X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe844054e8a0739e8c05b154d900939710a00608..944975221d770af8efe0e03ab4e339b5432e3dd9:/src/common/fileconf.cpp?ds=sidebyside

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index c229f690a6..ad4e20adb5 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -311,7 +311,7 @@ wxFileName wxFileConfig::GetLocalFile(const wxString& szFile, int style)
 {
     wxFileName fn(GetLocalDir(style), szFile);
 
-#ifdef __UNIX__
+#if defined( __UNIX__ ) && !defined( __WXMAC__ )
     if ( !(style & wxCONFIG_USE_SUBDIR) )
     {
         // dot-files under Unix start with, well, a dot (but OTOH they usually
@@ -319,7 +319,7 @@ wxFileName wxFileConfig::GetLocalFile(const wxString& szFile, int style)
         fn.SetName(wxT('.') + fn.GetName());
     }
     else // we do append ".conf" extension to config files in subdirectories
-#endif // __UNIX__
+#endif // defined( __UNIX__ ) && !defined( __WXMAC__ )
     {
         AddConfFileExtIfNeeded(fn);
     }
@@ -1035,7 +1035,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 
   ResetDirty();
 
-#if defined(__WXMAC__)
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
   m_fnLocalFile.MacSetTypeAndCreator('TEXT', 'ttxt');
 #endif // __WXMAC__