diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-08-09 02:02:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-03 17:02:24 +0200 |
| commit | 5527bdb269e355ca95aa91fe3907bfef0ef17ff4 (patch) | |
| tree | 5dd2fc2e81cf193c9712606f43f1e13e1a6e46bf /src/wx/grok | |
| parent | a27964bd1794bb6a843873a0eaf3faa2c5cc317a (diff) | |
Remove some implicit conversions between wxString and std::string.
Diffstat (limited to 'src/wx/grok')
| -rw-r--r-- | src/wx/grok/gpu_config_panel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/grok/gpu_config_panel.h b/src/wx/grok/gpu_config_panel.h index cbf037592..a73c26503 100644 --- a/src/wx/grok/gpu_config_panel.h +++ b/src/wx/grok/gpu_config_panel.h @@ -48,7 +48,7 @@ public: GpuList(wxPanel* parent) : wxPanel(parent, wxID_ANY) { - _combo_box = new wxComboBox(this, wxID_ANY, "", wxDefaultPosition, wxSize(400, -1)); + _combo_box = new wxComboBox(this, wxID_ANY, wxString{}, wxDefaultPosition, wxSize(400, -1)); _combo_box->Bind(wxEVT_COMBOBOX, &GpuList::OnComboBox, this); update(); @@ -67,7 +67,7 @@ public: _combo_box->Clear(); for (auto const& name: gpu_names) { - _combo_box->Append(name); + _combo_box->Append(std_to_wx(name)); } } } @@ -214,7 +214,7 @@ private: void licence_changed() { auto grok = Config::instance()->grok().get_value_or({}); - grok.licence = wx_to_std(_licence->get()); + grok.licence = _licence->get(); Config::instance()->set_grok(grok); } |