diff --git a/ctl/ctlSQLBox.cpp b/ctl/ctlSQLBox.cpp index c11f1ca..ef1cdcc 100644 --- a/ctl/ctlSQLBox.cpp +++ b/ctl/ctlSQLBox.cpp @@ -1170,7 +1170,9 @@ void ctlSQLBox::UpdateLineNumber() if (width != GetMarginWidth(0)) { SetMarginWidth(0, width); +#ifndef __WXGTK__ Update(); +#endif } } else diff --git a/include/ctl/ctlSQLGrid.h b/include/ctl/ctlSQLGrid.h index 81f01f1..f2251d4 100644 --- a/include/ctl/ctlSQLGrid.h +++ b/include/ctl/ctlSQLGrid.h @@ -102,7 +102,7 @@ public: // default group open rowsGroup[rowgroup] = -rowgroup; //beg[rowgroup]=rowgroup; - wxASSERT_MSG(lastrowgroup > end.Count(), " out of bounds"); + //wxASSERT_MSG(lastrowgroup > end.Count(), " out of bounds"); end[rowgroup] = lastrowgroup; run[rowgroup] = actualtime; }; diff --git a/utils/log/MyDataViewCtrl.cpp b/utils/log/MyDataViewCtrl.cpp index faf0ef5..f5a24ff 100644 --- a/utils/log/MyDataViewCtrl.cpp +++ b/utils/log/MyDataViewCtrl.cpp @@ -104,8 +104,10 @@ void MyDataViewCtrl::setGroupMode(bool mode) { wxString l = wxString::Format("rows %d", m->GetRowCount()); st->SetLabelText(l); - if (!SetHeaderAttr(attr)) - wxLogMessage("Sorry, header attributes not supported on this platform"); + if (!SetHeaderAttr(attr)) { + //wxLogMessage("Sorry, header attributes not supported on this platform"); + } + } void MyDataViewCtrl::ViewGroup(bool view) { @@ -381,6 +383,8 @@ void MyDataViewCtrl::OnEVT_DATAVIEW_CONTEXT_MENU(wxCommandEvent& event) { void MyDataViewCtrl::OnContextMenu(wxDataViewEvent& event) { //wxString title = m_music_model->GetTitle(event.GetItem()); //wxLogMessage("wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s", title); + int c = event.GetColumn(); + if (c < 0) return; StorageModel* m = dynamic_cast(GetModel()); int row = m->GetRow(event.GetItem()); int ncol; diff --git a/utils/log/Storage.cpp b/utils/log/Storage.cpp index aa00feb..0f7ee8e 100644 --- a/utils/log/Storage.cpp +++ b/utils/log/Storage.cpp @@ -685,7 +685,7 @@ wxString Storage::getStrGroup(wxString source) { wxString n; bool quote = false; while (i < l) { - char c = source[i++]; + wxChar c = source[i++]; if (c >= '0' && c <= '9' && !quote) continue; if (c == '"') {