use wxFileName::MacSetTypeAndCreator() in Flush() instead of duplicating its code...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index ac4e2a53ea9b415eeb82bdaeaa5630cea9d38a41..442fb4fc15d68b48f802a2e1ef66006bec54677a 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -983,29 +983,18 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
     }
   }
 
     }
   }
 

-  bool ret = file.Commit();
+  if ( !file.Commit() )
+  {
+      wxLogError(_("Failed to update user configuration file."));

 
 

-#if defined(__WXMAC__)
-    if ( ret )
-    {
-        FSRef fsRef ;
-        FSCatalogInfo catInfo;
-        FileInfo *finfo ;
+      return false;
+  }

 
 

-        if ( wxMacPathToFSRef( m_strLocalFile , &fsRef ) == noErr )
-        {
-            if ( FSGetCatalogInfo (&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL) == noErr )
-            {
-                finfo = (FileInfo*)&catInfo.finderInfo;
-                finfo->fileType = 'TEXT' ;
-                finfo->fileCreator = 'ttxt' ;
-                FSSetCatalogInfo( &fsRef, kFSCatInfoFinderInfo, &catInfo ) ;
-            }
-        }
-    }
+#if defined(__WXMAC__)
+  wxFileName(m_strLocalFile).MacSetTypeAndCreator('TEXT', 'ttxt');

 #endif // __WXMAC__
 
 #endif // __WXMAC__
 

-  return ret;
+  return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------