X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.cc;h=563c31f703264243946c05e785cec0c7031e26da;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=3a720cfecff8ec958d336c139c920bb64bcc6144;hpb=4b1c869f2139bcc0ad2163646d04e0d787cf8a32;p=dcpomatic.git

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 3a720cfec..563c31f70 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -32,8 +32,11 @@
 using std::list;
 using std::cout;
 using std::string;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
 	: wxDialog (
@@ -93,27 +96,6 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_pt
 	_film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
 }
 
-wxString
-TimelineDialog::bitmap_path (string name)
-{
-	boost::filesystem::path base;
-
-#ifdef DCPOMATIC_DEBUG
-	/* Hack to allow OS X to find icons when running from the source tree */
-	char* path = getenv ("DCPOMATIC_GRAPHICS");
-	if (path) {
-		base = path;
-	} else {
-		base = shared_path();
-	}
-#else
-	base = shared_path();
-#endif
-
-	boost::filesystem::path p = base / String::compose("%1.png", name);
-	return std_to_wx (p.string());
-}
-
 void
 TimelineDialog::film_change (ChangeType type, Film::Property p)
 {