summaryrefslogtreecommitdiff
path: root/src/wx/properties_dialog.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/wx/properties_dialog.cc')
-rw-r--r--src/wx/properties_dialog.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index b8a47e0e3..0ffbd06cb 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -25,10 +25,14 @@
#include "properties_dialog.h"
#include "wx_util.h"
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
+using boost::shared_ptr;
+using boost::lexical_cast;
-PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
+PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
, _film (film)
{
@@ -83,7 +87,7 @@ PropertiesDialog::frames_already_encoded () const
stringstream u;
try {
u << _film->encoded_frames ();
- } catch (thread_interrupted &) {
+ } catch (boost::thread_interrupted &) {
return "";
}