X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=720a058cb771425b67f0828aed0ba7f9fb8deb63;hb=3e1fa3cd581499278c1cc91c8991e8ed0e125e94;hp=4196dd632e01ef1c4477fc89a31ff1a7994580b6;hpb=3d9b5186aa39150e53aef3bab09f4350f85cb885;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 4196dd632..720a058cb 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -33,24 +33,32 @@ 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)
+add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, int prop)
 {
-	wxStaticText* m = new wxStaticText (p, wxID_ANY, std_to_wx (t));
+	wxStaticText* m = new wxStaticText (p, wxID_ANY, t);
 	s->Add (m, prop, wxALIGN_CENTER_VERTICAL | wxALL, 6);
 	return m;
 }
 
+wxStaticText *
+add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, wxGBPosition pos, wxGBSpan span)
+{
+	wxStaticText* m = new wxStaticText (p, wxID_ANY, t);
+	s->Add (m, pos, span, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+	return m;
+}
+
 /** Pop up an error dialogue box.
  *  @param parent Parent.
  *  @param m Message.
  */
 void
-error_dialog (wxWindow* parent, string m)
+error_dialog (wxWindow* parent, wxString m)
 {
-	wxMessageDialog* d = new wxMessageDialog (parent, std_to_wx (m), wxT ("DVD-o-matic"), wxOK);
+	wxMessageDialog* d = new wxMessageDialog (parent, m, _("DVD-o-matic"), wxOK);
 	d->ShowModal ();
 	d->Destroy ();
 }
@@ -79,8 +87,8 @@ int const ThreadedStaticText::_update_event_id = 10000;
  *  @param initial Initial text for the wxStaticText while the computation is being run.
  *  @param fn Function which works out what the wxStaticText content should be and returns it.
  */
-ThreadedStaticText::ThreadedStaticText (wxWindow* parent, string initial, function<string ()> fn)
-	: wxStaticText (parent, wxID_ANY, std_to_wx (initial))
+ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, function<string ()> fn)
+	: wxStaticText (parent, wxID_ANY, initial)
 {
 	Connect (_update_event_id, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ThreadedStaticText::thread_finished), 0, this);
 	_thread = new thread (bind (&ThreadedStaticText::run, this, fn));
@@ -119,6 +127,12 @@ void
 checked_set (wxFilePickerCtrl* widget, string value)
 {
 	if (widget->GetPath() != std_to_wx (value)) {
+		if (value.empty()) {
+			/* Hack to make wxWidgets clear the control when we are passed
+			   an empty value.
+			*/
+			value = " ";
+		}
 		widget->SetPath (std_to_wx (value));
 	}
 }
@@ -132,7 +146,7 @@ checked_set (wxSpinCtrl* widget, int value)
 }
 
 void
-checked_set (wxComboBox* widget, int value)
+checked_set (wxChoice* widget, int value)
 {
 	if (widget->GetSelection() != value) {
 		widget->SetSelection (value);
@@ -140,9 +154,12 @@ checked_set (wxComboBox* widget, int 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) {
@@ -161,6 +178,14 @@ checked_set (wxTextCtrl* widget, string value)
 	}
 }
 
+void
+checked_set (wxStaticText* widget, string value)
+{
+	if (widget->GetLabel() != std_to_wx (value)) {
+		widget->SetLabel (std_to_wx (value));
+	}
+}
+
 void
 checked_set (wxCheckBox* widget, bool value)
 {