summaryrefslogtreecommitdiff
path: root/src/wx/wx_util.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-17 19:25:33 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-17 19:25:33 +0000
commit4228cb5b5323e9dc4bc87182b27427e48bb59d91 (patch)
tree42b0222c333c7bb27f7ae68196837d9dbfa6b65a /src/wx/wx_util.cc
parent4f19455332f1f4cc4c313338b7fb0b6fc508d5b4 (diff)
Use a separate file (in a configurable location) to store cinema / screen certificates (#796).
Diffstat (limited to 'src/wx/wx_util.cc')
-rw-r--r--src/wx/wx_util.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 1e990c495..d7620eff4 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -21,12 +21,12 @@
* @brief Some utility functions and classes.
*/
-#include <boost/thread.hpp>
-#include <wx/filepicker.h>
-#include <wx/spinctrl.h>
+#include "wx_util.h"
+#include "file_picker_ctrl.h"
#include "lib/config.h"
#include "lib/util.h"
-#include "wx_util.h"
+#include <wx/spinctrl.h>
+#include <boost/thread.hpp>
using namespace std;
using namespace boost;
@@ -136,16 +136,16 @@ string_client_data (wxClientData* o)
}
void
-checked_set (wxFilePickerCtrl* widget, string value)
+checked_set (FilePickerCtrl* widget, boost::filesystem::path value)
{
- if (widget->GetPath() != std_to_wx (value)) {
+ if (widget->GetPath() != std_to_wx (value.string())) {
if (value.empty()) {
/* Hack to make wxWidgets clear the control when we are passed
an empty value.
*/
value = " ";
}
- widget->SetPath (std_to_wx (value));
+ widget->SetPath (std_to_wx (value.string()));
}
}