corrected GetKeyInfo() (bug 1815516)

[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 d4068cc2fa448431fbb7329822eae81f1d84c18a..f8cf48355a0e118d378c02458134914f4698ab48 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -31,7 +31,6 @@
 #include "wx/mac/private.h"
 #endif
 #include "wx/mac/corefoundation/cfstring.h"
 #include "wx/mac/private.h"
 #endif
 #include "wx/mac/corefoundation/cfstring.h"

-#include "wx/mac/private.h"

 
 #if defined(__DARWIN__)
 #include <CoreFoundation/CFBundle.h>
 
 #if defined(__DARWIN__)
 #include <CoreFoundation/CFBundle.h>


@@ -152,6 +151,27 @@ 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
+{
+#ifdef __WXMAC__
+    ProcessInfoRec processinfo;
+    ProcessSerialNumber procno ;
+    FSSpec fsSpec;
+
+    procno.highLongOfPSN = 0 ;
+    procno.lowLongOfPSN = kCurrentProcess ;
+    processinfo.processInfoLength = sizeof(ProcessInfoRec);
+    processinfo.processName = NULL;
+    processinfo.processAppSpec = &fsSpec;
+
+    GetProcessInformation( &procno , &processinfo ) ;
+    return wxMacFSSpec2MacFilename(&fsSpec);
+#else
+    return wxStandardPathsBase::GetExecutablePath();
+#endif
+}
+

 wxString wxStandardPathsCF::GetLocalDataDir() const
 {
 #ifdef __WXMAC__
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {
 #ifdef __WXMAC__


@@ -181,7 +201,7 @@ wxString wxStandardPathsCF::GetResourcesDir() const
 }
 
 wxString
 }
 
 wxString

-wxStandardPathsCF::GetLocalizedResourcesDir(const wxChar *lang,
+wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang,

                                             ResourceCat category) const
 {
     return wxStandardPathsBase::
                                             ResourceCat category) const
 {
     return wxStandardPathsBase::