[108890] trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff
jwa at macports.org
jwa at macports.org
Sun Aug 4 06:57:44 PDT 2013
Revision: 108890
https://trac.macports.org/changeset/108890
Author: jwa at macports.org
Date: 2013-08-04 06:57:44 -0700 (Sun, 04 Aug 2013)
Log Message:
-----------
pgAdmin3: patch file for wxWidgets 2.9.5 was missing in r108888
Revision Links:
--------------
https://trac.macports.org/changeset/108888
Added Paths:
-----------
trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff
Added: trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff
===================================================================
--- trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff (rev 0)
+++ trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff 2013-08-04 13:57:44 UTC (rev 108890)
@@ -0,0 +1,49 @@
+--- pgadmin/pgAdmin3.cpp.orig
++++ pgadmin/pgAdmin3.cpp
+@@ -1304,7 +1304,7 @@ wxString pgAdmin3::LocatePath(const wxString &pathToFind, const bool isFile)
+ // 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.orig
++++ pgadmin/utils/sysSettings.cpp
+@@ -740,7 +740,7 @@ wxString sysSettings::GetConfigFile(configFileName cfgname)
+ {
+ if (cfgname == PGPASS)
+ {
+- wxStandardPaths stdp;
++ wxStandardPaths stdp = wxStandardPaths::Get();
+ wxString fname = stdp.GetUserConfigDir();
+ #ifdef WIN32
+ fname += wxT("\\postgresql");
+@@ -770,7 +770,7 @@ wxString sysSettings::GetFavouritesFile()
+ {
+ wxString s, tmp;
+
+- wxStandardPaths stdp;
++ wxStandardPaths stdp = wxStandardPaths::Get();
+ tmp = stdp.GetUserConfigDir();
+ #ifdef WIN32
+ tmp += wxT("\\postgresql");
+@@ -791,7 +791,7 @@ wxString sysSettings::GetMacrosFile()
+ {
+ wxString s, tmp;
+
+- wxStandardPaths stdp;
++ wxStandardPaths stdp = wxStandardPaths::Get();
+ tmp = stdp.GetUserConfigDir();
+ #ifdef WIN32
+ tmp += wxT("\\postgresql");
+@@ -812,7 +812,7 @@ wxString sysSettings::GetHistoryFile()
+ {
+ wxString s, tmp;
+
+- wxStandardPaths stdp;
++ wxStandardPaths stdp = wxStandardPaths::Get();
+ tmp = stdp.GetUserConfigDir();
+ #ifdef WIN32
+ tmp += wxT("\\postgresql");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130804/08f0ed99/attachment.html>
More information about the macports-changes
mailing list