From 6c5cd3e54f7a63ca89a824944b3c87236815764b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 9 Aug 2024 02:20:36 +0200
Subject: Add some convenience methods to the Choice class.

---
 src/wx/dcpomatic_choice.cc | 21 +++++++++++++++++++++
 src/wx/dcpomatic_choice.h  |  4 ++++
 2 files changed, 25 insertions(+)

(limited to 'src')

diff --git a/src/wx/dcpomatic_choice.cc b/src/wx/dcpomatic_choice.cc
index ab7823901..52aaa4fc4 100644
--- a/src/wx/dcpomatic_choice.cc
+++ b/src/wx/dcpomatic_choice.cc
@@ -82,6 +82,13 @@ Choice::add_entry(wxString const& entry, wxString const& data)
 }
 
 
+void
+Choice::add_entry(wxString const& entry, string const& data)
+{
+	add_entry(entry, std_to_wx(data));
+}
+
+
 void
 Choice::set_entries(wxArrayString const& entries)
 {
@@ -115,6 +122,13 @@ Choice::set_by_data(wxString const& data)
 }
 
 
+void
+Choice::set_by_data(string const& data)
+{
+	set_by_data(std_to_wx(data));
+}
+
+
 optional<int>
 Choice::get() const
 {
@@ -138,3 +152,10 @@ Choice::get_data() const
 	return dynamic_cast<wxStringClientData*>(GetClientObject(*index))->GetData();
 }
 
+
+void
+Choice::clear()
+{
+	Clear();
+}
+
diff --git a/src/wx/dcpomatic_choice.h b/src/wx/dcpomatic_choice.h
index cc8115d20..5417c1aa2 100644
--- a/src/wx/dcpomatic_choice.h
+++ b/src/wx/dcpomatic_choice.h
@@ -35,11 +35,15 @@ public:
 	void add_entry(wxString const& entry);
 	void add_entry(wxString const& entry, wxClientData* data);
 	void add_entry(wxString const& entry, wxString const& data);
+	void add_entry(wxString const& entry, std::string const& data);
 	void add_entry(std::string const& entry);
 	void set_entries(wxArrayString const& entries);
 
+	void clear();
+
 	void set(int index);
 	void set_by_data(wxString const& data);
+	void set_by_data(std::string const& data);
 	boost::optional<int> get() const;
 	boost::optional<wxString> get_data() const;
 
-- 
cgit v1.2.3