Use wxChoice instead of wxComboBox throughout. Fixes dcp content type hanging over...

[dcpomatic.git] / src / wx / wx_util.cc

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 186e9c86b5b6fba09a9618ce9c7fe4ff6f2dcc38..413071ea6989e0e395a5b5b64b23d2212f57dace 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -33,7 +33,7 @@ using namespace boost;
  *  @param s Sizer to add to.
  *  @param p Parent window for the wxStaticText.
  *  @param t Text for the wxStaticText.
- *  @param prop Properties to pass when calling Add() on the wxSizer.
+ *  @param prop Proportion to pass when calling Add() on the wxSizer.
  */
 wxStaticText *
 add_label_to_sizer (wxSizer* s, wxWindow* p, string t, int prop)
@@ -138,24 +138,20 @@ 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 = widget->GetClientObject (widget->GetSelection ());
+       wxClientData* o = 0;
+       if (widget->GetSelection() != -1) {
+               o = widget->GetClientObject (widget->GetSelection ());
+       }
        
        if (!o || string_client_data(o) != value) {
                for (unsigned int i = 0; i < widget->GetCount(); ++i) {