summaryrefslogtreecommitdiff
path: root/src/wx/wx_util.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-25 19:55:37 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-25 19:55:37 +0000
commita7130995cf5f13396746932511ba133e8ad4ca9d (patch)
tree92c407ead30b50e539029fcc5a0e6030bc0c9a90 /src/wx/wx_util.cc
parent7101dd05ddcde66600bded064e28b491d79e3ebc (diff)
Use wxChoice instead of wxComboBox throughout. Fixes dcp content type hanging over on new film.
Diffstat (limited to 'src/wx/wx_util.cc')
-rw-r--r--src/wx/wx_util.cc13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index bc444e4bc..413071ea6 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -138,22 +138,15 @@ checked_set (wxSpinCtrl* widget, int value)
}
void
-checked_set (wxComboBox* widget, int value)
+checked_set (wxChoice* widget, int value)
{
if (widget->GetSelection() != value) {
- if (value == wxNOT_FOUND) {
- /* Work around an apparent wxWidgets bug; SetSelection (wxNOT_FOUND)
- appears not to work sometimes.
- */
- widget->SetValue (wxT (""));
- } else {
- widget->SetSelection (value);
- }
+ widget->SetSelection (value);
}
}
void
-checked_set (wxComboBox* widget, string value)
+checked_set (wxChoice* widget, string value)
{
wxClientData* o = 0;
if (widget->GetSelection() != -1) {