fix assert when the control doesn't have a valid date initially (bug 1648192)

[wxWidgets.git] / src / mac / corefoundation / stdpaths_cf.cpp

diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp
index bd254964adfdfeffd2ec50bf864940084d3c6bf8..925d220ecffb3e2e1342000bccc2be7cd2c5a25d 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -151,8 +151,10 @@ wxString wxStandardPathsCF::GetDataDir() const
     return GetFromFunc(CFBundleCopySharedSupportURL);
 }
 
     return GetFromFunc(CFBundleCopySharedSupportURL);
 }
 

+// TODO: implement this using real CoreFoundation API instead of Carbon API

 wxString wxStandardPathsCF::GetExecutablePath() const
 {
 wxString wxStandardPathsCF::GetExecutablePath() const
 {

+#ifdef __WXMAC__

     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
     FSSpec fsSpec;
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
     FSSpec fsSpec;


@@ -165,6 +167,9 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 
     GetProcessInformation( &procno , &processinfo ) ;
     return wxMacFSSpec2MacFilename(&fsSpec);
 
     GetProcessInformation( &procno , &processinfo ) ;
     return wxMacFSSpec2MacFilename(&fsSpec);

+#else
+    return wxStandardPathsBase::GetExecutablePath();
+#endif

 }
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 }
 
 wxString wxStandardPathsCF::GetLocalDataDir() const