projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename shared_path -> resources_path.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_playlist.cc
diff --git
a/src/tools/dcpomatic_playlist.cc
b/src/tools/dcpomatic_playlist.cc
index f8f2a8bba834c36918fb02d66ce42d4a63847945..50fed2c9402dd758aeffffc3e9540feffb51d654 100644
(file)
--- a/
src/tools/dcpomatic_playlist.cc
+++ b/
src/tools/dcpomatic_playlist.cc
@@
-36,9
+36,6
@@
#include <wx/imaglist.h>
#include <wx/spinctrl.h>
#include <wx/preferences.h>
#include <wx/imaglist.h>
#include <wx/spinctrl.h>
#include <wx/preferences.h>
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
#include <boost/foreach.hpp>
using std::exception;
#include <boost/foreach.hpp>
using std::exception;
@@
-52,6
+49,9
@@
using boost::shared_ptr;
using boost::weak_ptr;
using boost::bind;
using boost::dynamic_pointer_cast;
using boost::weak_ptr;
using boost::bind;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
class ContentDialog : public wxDialog, public ContentStore
{
class ContentDialog : public wxDialog, public ContentStore
{
@@
-277,9
+277,9
@@
public:
tick_icon.LoadFile ("tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
no_tick_icon.LoadFile ("no_tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
#else
tick_icon.LoadFile ("tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
no_tick_icon.LoadFile ("no_tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
#else
- boost::filesystem::path tick_path =
shared
_path() / "tick.png";
+ boost::filesystem::path tick_path =
resources
_path() / "tick.png";
tick_icon.LoadFile (std_to_wx(tick_path.string()), wxBITMAP_TYPE_PNG);
tick_icon.LoadFile (std_to_wx(tick_path.string()), wxBITMAP_TYPE_PNG);
- boost::filesystem::path no_tick_path =
shared
_path() / "no_tick.png";
+ boost::filesystem::path no_tick_path =
resources
_path() / "no_tick.png";
no_tick_icon.LoadFile (std_to_wx(no_tick_path.string()), wxBITMAP_TYPE_PNG);
#endif
images->Add (tick_icon);
no_tick_icon.LoadFile (std_to_wx(no_tick_path.string()), wxBITMAP_TYPE_PNG);
#endif
images->Add (tick_icon);
@@
-574,7
+574,8
@@
private:
bool OnInit ()
try
{
bool OnInit ()
try
{
- SetAppName (_("DCP-o-matic KDM Creator"));
+ wxInitAllImageHandlers ();
+ SetAppName (_("DCP-o-matic Playlist Editor"));
if (!wxApp::OnInit()) {
return false;
if (!wxApp::OnInit()) {
return false;
@@
-584,10
+585,8
@@
private:
unsetenv ("UBUNTU_MENUPROXY");
#endif
unsetenv ("UBUNTU_MENUPROXY");
#endif
-#ifdef __WXOSX__
- ProcessSerialNumber serial;
- GetCurrentProcess (&serial);
- TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+ make_foreground_application ();
#endif
dcpomatic_setup_path_encoding ();
#endif
dcpomatic_setup_path_encoding ();