mirror of
https://github.com/levinsv/pgadmin3.git
synced 2026-05-15 14:15:49 -06:00
fix Compare database for linux.
Шаблон textcompare_report.template можно размещать в ~/.local/share/pgadmin3.
This commit is contained in:
parent
3bf13cd363
commit
edbf7ba4a8
1 changed files with 7 additions and 2 deletions
|
|
@ -80,6 +80,8 @@ EVT_BUTTON(wxID_OK, frmReport::OnOK)
|
|||
EVT_BUTTON(wxID_CANCEL, frmReport::OnCancel)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
extern wxString dataDir;
|
||||
|
||||
typedef std::vector<double> vectord;
|
||||
template<typename A, typename B>
|
||||
std::pair<B, A> flip_pair(const std::pair<A, B>& p)
|
||||
|
|
@ -1872,9 +1874,12 @@ MyListSql::iterator iter2;
|
|||
#else
|
||||
wxString fDir=wxStandardPaths::Get().GetExecutablePath().BeforeLast('\\')+wxT("\\");
|
||||
#endif
|
||||
|
||||
wxString f=fDir+"textcompare_report.template";
|
||||
wxString buffer;
|
||||
|
||||
if (!wxFileExists(f)) {
|
||||
f=dataDir+wxFileName::GetPathSeparator()+"textcompare_report.template";
|
||||
}
|
||||
wxUtfFile file3(f, wxFile::read, wxFONTENCODING_UTF8);
|
||||
if (file3.IsOpened())
|
||||
{
|
||||
|
|
@ -1941,7 +1946,7 @@ MyListSql::iterator iter2;
|
|||
}
|
||||
|
||||
//head+="</div></body></html>";
|
||||
fDir=wxStandardPaths::Get().GetTempDir()+wxT("\\cmp.html");
|
||||
fDir=wxStandardPaths::Get().GetTempDir()+wxFileName::GetPathSeparator()+wxT("cmp.html");
|
||||
//fn="D:\\PostgreSQL\\cmp.html";
|
||||
fn=fDir;
|
||||
fn.MakeAbsolute();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue