projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add first part of pt_BR translation from Thiago Andre.
[dcpomatic.git]
/
src
/
wx
/
wx_util.cc
diff --git
a/src/wx/wx_util.cc
b/src/wx/wx_util.cc
index 1e990c49515c13393c403c3e7c7680f807e6f3a3..d7620eff40acf0079c53fa858aacca03ab16fd8e 100644
(file)
--- a/
src/wx/wx_util.cc
+++ b/
src/wx/wx_util.cc
@@
-21,12
+21,12
@@
* @brief Some utility functions and classes.
*/
* @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 "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;
using namespace std;
using namespace boost;
@@
-136,16
+136,16
@@
string_client_data (wxClientData* o)
}
void
}
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 = " ";
}
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()
));
}
}
}
}