fix warning for mingw32

This commit is contained in:
lsv 2025-10-16 09:24:07 +05:00
parent 7db41df697
commit 0f91ec5e67
12 changed files with 55 additions and 33 deletions

View file

@ -2826,13 +2826,14 @@ void frmQuery::OnExplain(wxCommandEvent &event)
}
wxString query = sqlQuery->GetSelectedText();
if (query.IsNull())
if (query.IsNull()) {
if (queryMenu->IsChecked(MNU_AUTOSELECTQUERY)) {
// Auto-select
SelectQuery();
query = sqlQuery->GetSelectedText();
} else query = sqlQuery->GetText();
} else
query = sqlQuery->GetText();
}
if (query.IsNull())
return;
wxString sql;
@ -3032,13 +3033,14 @@ void frmQuery::OnExecute(wxCommandEvent &event)
CheckModificationFile();
SaveTempFile();
wxString query = sqlQuery->GetSelectedText();
if (query.IsNull())
if (query.IsNull()) {
if (queryMenu->IsChecked(MNU_AUTOSELECTQUERY)) {
// Auto-select
SelectQuery();
query = sqlQuery->GetSelectedText();
} else query = sqlQuery->GetText();
} else
query = sqlQuery->GetText();
}
if (query.IsNull())
return;
// set marker sqlQueryExec->MarkerAdd(line, 0); // wxSTC_MARK_CIRCLE
@ -3123,7 +3125,7 @@ void frmQuery::OnExecScript(wxCommandEvent &event)
// Clear markers and indicators
sqlQuery->MarkerDeleteAll(0);
sqlQuery->StartStyling(0, wxSTC_INDICS_MASK);
sqlQuery->StartStyling(0);
sqlQuery->SetStyling(sqlQuery->GetText().Length(), 0);
// Menu stuff to initialize

View file

@ -604,9 +604,9 @@ void mpFXY::Plot(wxDC &dc, mpWindow &w) {
Rewind();
GetNextXY(x, y);
maxDrawX = 0;
minDrawX = 10000000000;
minDrawX = 1000000000;
maxDrawY = 0;
minDrawY = 10000000000;
minDrawY = 1000000000;
// drawnPoints = 0;
Rewind();
@ -886,7 +886,7 @@ wxString mpScaleX::GetLabelTextValue(double &v) {
fmt = (wxT("%04.0f-%02.0f-%02.0f %02.0f:%02.0f:%02.0f"));
} else if (m_labelType == mpX_DATE) {
fmt = (wxT("%04.0f-%02.0f-%02.0f"));
} else if ((m_labelType == mpX_TIME)) {
} else if (m_labelType == mpX_TIME) {
fmt = (wxT("%02.0f:%02.3f"));
} else {
fmt = (wxT("%02.0f:%02.0f:%02.0f"));