projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
wx_util.cc
diff --git
a/src/wx/wx_util.cc
b/src/wx/wx_util.cc
index 46b122a8a6c82dca3231e2740553f8ce8c7ed6c7..5d02d27bf80ffd6a9e64e1ffcfd0cae82de44b0e 100644
(file)
--- a/
src/wx/wx_util.cc
+++ b/
src/wx/wx_util.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-44,7
+44,7
@@
DCPOMATIC_ENABLE_WARNINGS
using std::string;
using std::vector;
using std::pair;
using std::string;
using std::vector;
using std::pair;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
using dcp::locale_convert;
using namespace dcpomatic;
using boost::optional;
using dcp::locale_convert;
using namespace dcpomatic;
@@
-473,8
+473,7
@@
maybe_show_splash ()
wxSplashScreen* splash = 0;
try {
wxBitmap bitmap;
wxSplashScreen* splash = 0;
try {
wxBitmap bitmap;
- boost::filesystem::path p = shared_path () / "splash.png";
- if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
+ if (bitmap.LoadFile(bitmap_path("splash"), wxBITMAP_TYPE_PNG)) {
splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
wxYield ();
}
splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
wxYield ();
}
@@
-578,18
+577,29
@@
bitmap_path (string name)
boost::filesystem::path base;
#ifdef DCPOMATIC_DEBUG
boost::filesystem::path base;
#ifdef DCPOMATIC_DEBUG
- /* Hack to allow OS X to find icons when running from the source tree */
+ /* Hack to allow
Linux and
OS X to find icons when running from the source tree */
char* path = getenv ("DCPOMATIC_GRAPHICS");
if (path) {
base = path;
} else {
char* path = getenv ("DCPOMATIC_GRAPHICS");
if (path) {
base = path;
} else {
- base =
shared
_path();
+ base =
resources
_path();
}
#else
}
#else
- base =
shared
_path();
+ base =
resources
_path();
#endif
boost::filesystem::path p = base / String::compose("%1.png", name);
return std_to_wx (p.string());
}
#endif
boost::filesystem::path p = base / String::compose("%1.png", name);
return std_to_wx (p.string());
}
+
+wxSize
+small_button_size (wxWindow* parent, wxString text)
+{
+ wxClientDC dc (parent);
+ wxSize size = dc.GetTextExtent (text);
+ size.SetHeight (-1);
+ size.IncBy (24, 0);
+ return size;
+}
+