github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

fix crash pgadmin3

Browse source 
Исправлена ошибка которая стала появлятся после новых изменений.
Ошибка вызвана особенностями работы диалоговых окон.
This commit is contained in:
lsv 2025-08-06 09:51:50 +05:00 • committed by lsv
parent b539dc493b
commit 55080c0161
5 changed files with 43 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frm/frmExport.cpp
View file

@ -386,7 +386,7 @@ bool frmExport::ExportXls(ctlSQLResult *grid)
;
file.Write(line, wxConvUTF8);
file.Close();
#ifdef WIN32
#ifdef __WXMSW__
wxAutomationObject excelObject;
if (excelObject.CreateInstance(wxT("Excel.Application"))) {
//excelObject.GetObject(xlbook,wxT("Workbooks.Add"));

12
frm/frmStatus.cpp
View file

@ -1192,7 +1192,7 @@ void frmStatus::AddLogPane()
// if server release is less than 8.0 or if server has no adminpack
if (!is_read_log) {
logList->InsertColumn(logList->GetColumnCount(), _("Message"), wxLIST_FORMAT_LEFT, 700);
logList->AppendItem(-1, _("Function pg_read_binary_file(text,bigint,bigint,boolean) permission denied."));
logList->AppendItemLong(-1, _("Function pg_read_binary_file(text,bigint,bigint,boolean) permission denied."));
logList->Enable(false);
logTimer = NULL;
// We're done
@ -1223,7 +1223,7 @@ void frmStatus::AddLogPane()
if (!connection->HasFeature(FEATURE_FILEREAD, true))
{
logList->InsertColumn(logList->GetColumnCount(), _("Message"), wxLIST_FORMAT_LEFT, wxLIST_AUTOSIZE_USEHEADER);
logList->AppendItem(-1,_("Logs are not available for this server."));
logList->AppendItemLong(-1,_("Logs are not available for this server."));
logList->Enable(false);
logTimer = NULL;
// We're done
@ -2713,9 +2713,9 @@ void frmStatus::OnRefreshLogTimer(wxTimerEvent &event)
return;
logDirectory = wxT("-");
if (connection->BackendMinimumVersion(8, 3))
logList->AppendItem(-1, wxString(_("logging_collector not enabled or log_filename misconfigured")));
logList->AppendItemLong(-1, wxString(_("logging_collector not enabled or log_filename misconfigured")));
else
logList->AppendItem(-1, wxString(_("redirect_stderr not enabled or log_filename misconfigured")));
logList->AppendItemLong(-1, wxString(_("redirect_stderr not enabled or log_filename misconfigured")));
cbLogfiles->Disable();
btnRotateLog->Disable();
}
@ -3143,7 +3143,7 @@ void frmStatus::addLogLine(const wxString &str, bool formatted, bool csv_log_for
}
if (!logFormatKnown) {
logList->AppendItem(-1, str);
logList->AppendItemLong(-1, str);
int colorindex = nav->TryMarkItem(row, str);
if (colorindex>=0)
logList->SetItemBackgroundColour(row, nav->GetColorByIndex(colorindex));
@ -4640,7 +4640,7 @@ void frmStatus::OnTimerHintLog(wxTimerEvent& event)
}
else {
}
s = logList->GetText(lastlogitem);
s = logList->GetTextLong(lastlogitem);
lastlogitemShow = lastlogitem;
lastlogitem = -1;
wxSize rr(350, 25);