Ticket #39787: patch-wxStandardPaths.diff

pgadmin/pgAdmin3.cpp

@@ -1304 +1304 @@
         // When using wxStandardPaths on OSX, wx default to the unix,
         // not to the mac variants. Therefore, we request wxStandardPathsCF
         // directly.
-        wxStandardPathsCF stdPaths ;
+        wxStandardPaths stdPaths = wxStandardPaths::Get();
         dataDir = stdPaths.GetDataDir() ;
 
 #else // other *ixes

pgadmin/utils/sysSettings.cpp

@@ -740 +740 @@
 {
         if (cfgname == PGPASS)
         {
-                wxStandardPaths stdp;
+                wxStandardPaths stdp = wxStandardPaths::Get();
                 wxString fname = stdp.GetUserConfigDir();
 #ifdef WIN32
                 fname += wxT("\\postgresql");
@@ -770 +770 @@
 {
         wxString s, tmp;
 
-        wxStandardPaths stdp;
+        wxStandardPaths stdp = wxStandardPaths::Get();
         tmp = stdp.GetUserConfigDir();
 #ifdef WIN32
         tmp += wxT("\\postgresql");
@@ -791 +791 @@
 {
         wxString s, tmp;
 
-        wxStandardPaths stdp;
+        wxStandardPaths stdp = wxStandardPaths::Get();
         tmp = stdp.GetUserConfigDir();
 #ifdef WIN32
         tmp += wxT("\\postgresql");
@@ -812 +812 @@
 {
         wxString s, tmp;
 
-        wxStandardPaths stdp;
+        wxStandardPaths stdp = wxStandardPaths::Get();
         tmp = stdp.GetUserConfigDir();
 #ifdef WIN32
         tmp += wxT("\\postgresql");