diff --git a/ctl/ctlNavigatePanel.cpp b/ctl/ctlNavigatePanel.cpp index cf5605e..5baadfc 100644 --- a/ctl/ctlNavigatePanel.cpp +++ b/ctl/ctlNavigatePanel.cpp @@ -437,6 +437,7 @@ bool ctlNavigatePanel::RunKeyCommand(wxKeyEvent& event,int numCmd) { } if (help) { wxMessageBox(helpstr, _("Help")); + return true; } } return false; diff --git a/ctl/ctlSQLResult.cpp b/ctl/ctlSQLResult.cpp index 37a9007..bc07136 100644 --- a/ctl/ctlSQLResult.cpp +++ b/ctl/ctlSQLResult.cpp @@ -387,7 +387,7 @@ wxString ctlSQLResult::GenerateTemplate(wxString &templ,int action) if (c=='a') isalign=true; else if (c=='e') e.flags.no_quote=true; else { - wxString msg=wxString::Format(_("Incorrect flag at the %s column."),col); + wxString msg=wxString::Format(_("Incorrect flag at the '%s' column."),col); if (action == 0) wxMessageBox(msg); return msg; } @@ -409,13 +409,13 @@ wxString ctlSQLResult::GenerateTemplate(wxString &templ,int action) if (c=='@') { isvar=false; if (col.Len()==0) { - wxString msg=wxString::Format(_("The column name empty. %s ."),templ.substr(startvarpos,pos-startvarpos)); + wxString msg=wxString::Format(_("The column name empty. '%s' ."),templ.substr(startvarpos,pos-startvarpos)); if (action == 0) wxMessageBox(msg); return msg; } int idx=colNames.Index(col); if (idx==wxNOT_FOUND) { - wxString msg=wxString::Format(_("The column name %s was not found in the query results."),col); + wxString msg=wxString::Format(_("The column name '%s' was not found in the query results."),col); if (action == 0) wxMessageBox(msg); return msg; } @@ -439,7 +439,7 @@ wxString ctlSQLResult::GenerateTemplate(wxString &templ,int action) } if (isvar ) { - wxString msg=wxString::Format(_("The column name %s is not closed."),col); + wxString msg=wxString::Format(_("The column name '%s' is not closed."),col); if (action == 0) wxMessageBox(msg); return msg; } diff --git a/frm/frmStatus.cpp b/frm/frmStatus.cpp index 529cc28..e9c5b4f 100644 --- a/frm/frmStatus.cpp +++ b/frm/frmStatus.cpp @@ -4803,9 +4803,18 @@ void frmStatus::OnMoveMouseLog(wxMouseEvent& event) void frmStatus::OnRightClickLogGrid(wxListEvent& event) { delayHitLog->Stop(); - wxMenu* logListPopupMenu; - logListPopupMenu = nav->GetPopupMenu(); - logList->PopupMenu(logListPopupMenu, event.GetPoint()); + lastmouse = wxGetMousePosition(); + wxTimerEvent tm; + //logList->GetItem(); + //int flags = wxLIST_HITTEST_ONITEMLABEL; + //long item=logList->HitTest(mp,flags); + long item=event.GetIndex(); + lastlogitem=item; + lastlogitemShow=-1; + OnTimerHintLog(tm); +// wxMenu* logListPopupMenu; +// logListPopupMenu = nav->GetPopupMenu(); +// logList->PopupMenu(logListPopupMenu, event.GetPoint()); }