Stefan Brüns
46d2cce987
- Update to version 3.8.1 To many changes to list, for details see: https://www.ncbi.nlm.nih.gov/tools/gbench/releasenotes/ - Update to version 3.8.0 To many changes to list, for details see: https://www.ncbi.nlm.nih.gov/tools/gbench/releasenotes/ - Update to version 3.7.1 To many changes to list, for details see: https://www.ncbi.nlm.nih.gov/tools/gbench/releasenotes/ - Fix several build issues, add: * fix_MFLAGS.patch * fix_GDK_DISPLAY_call.patch * 0001-Trigger-changed-event-on-leave-events.patch * 0001-Fix-missing-conversion-from-wxString-to-std-string.patch - Remove obsolete patches: * gbench_install.sh.patch * Makefile.in.top.patch - Update to version 3.3.1 To many changes to list, for details see: https://www.ncbi.nlm.nih.gov/tools/gbench/releasenotes/ OBS-URL: https://build.opensuse.org/request/show/1003639 OBS-URL: https://build.opensuse.org/package/show/science/gbench?expand=0&rev=2
54 lines
2.5 KiB
Diff
54 lines
2.5 KiB
Diff
From 7575c2db8c2bd1e0c9fb7b6f92507bd8a6ebbfc2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Mon, 29 Aug 2022 21:05:45 +0200
|
|
Subject: [PATCH] Fix missing conversion from wxString to std string
|
|
|
|
---
|
|
src/gui/packages/pkg_sequence_edit/seq_table_grid.cpp | 2 +-
|
|
src/gui/widgets/edit/macro_panel_loader.cpp | 2 +-
|
|
src/gui/widgets/edit/srcmod_list_panel.cpp | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/gui/packages/pkg_sequence_edit/seq_table_grid.cpp b/src/gui/packages/pkg_sequence_edit/seq_table_grid.cpp
|
|
index 273b64eb..682293dd 100644
|
|
--- a/src/gui/packages/pkg_sequence_edit/seq_table_grid.cpp
|
|
+++ b/src/gui/packages/pkg_sequence_edit/seq_table_grid.cpp
|
|
@@ -2421,7 +2421,7 @@ void CSeqTableGridPanel::x_UpdateCountSelectedDisplay()
|
|
while (w != NULL)
|
|
{
|
|
wxWindowList& wlist = w->GetChildren();
|
|
- for ( wxWindowList::Node *node = wlist.GetFirst(); node; node = node->GetNext() )
|
|
+ for ( auto node = wlist.GetFirst(); node; node = node->GetNext() )
|
|
{
|
|
wxWindow *current = (wxWindow *)node->GetData();
|
|
select_win = dynamic_cast<CStringConstraintSelect*>(current);
|
|
diff --git a/src/gui/widgets/edit/macro_panel_loader.cpp b/src/gui/widgets/edit/macro_panel_loader.cpp
|
|
index 7d7f9bd0..4a266c12 100644
|
|
--- a/src/gui/widgets/edit/macro_panel_loader.cpp
|
|
+++ b/src/gui/widgets/edit/macro_panel_loader.cpp
|
|
@@ -92,7 +92,7 @@ CMacroPanelLoader::CMacroPanelLoader(wxWindow *parent, const string &panel_name,
|
|
|
|
|
|
for (const auto &argument : arguments) {
|
|
- wxControl *control = XRCCTRL(*m_Panel, wxString(argument.m_Name), wxControl);
|
|
+ wxControl *control = XRCCTRL(*m_Panel, argument.m_Name.c_str(), wxControl);
|
|
if (control == nullptr) {
|
|
throw runtime_error("Control " + argument.m_Name + " not found!");
|
|
}
|
|
diff --git a/src/gui/widgets/edit/srcmod_list_panel.cpp b/src/gui/widgets/edit/srcmod_list_panel.cpp
|
|
index 57970cd2..19f7cf81 100644
|
|
--- a/src/gui/widgets/edit/srcmod_list_panel.cpp
|
|
+++ b/src/gui/widgets/edit/srcmod_list_panel.cpp
|
|
@@ -381,7 +381,7 @@ void CSrcModListPanel::x_AddTextSrcMods ()
|
|
m_Sizer->Clear(true);
|
|
|
|
for (auto&& it : m_Data) {
|
|
- if (NStr::EqualNocase(it.name, "note")) {
|
|
+ if (NStr::EqualNocase(ToStdString(it.name), "note")) {
|
|
//save note for later
|
|
} else if (s_IsNonText(ToStdString(it.name))) {
|
|
if (NStr::IsBlank(ToStdString(it.value))) {
|
|
--
|
|
2.37.2
|
|
|