projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac0bf0e
)
Add some stubs so that swaroop variants build on OS X.
author
Carl Hetherington
<cth@carlh.net>
Mon, 22 Jul 2019 14:23:02 +0000
(15:23 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 22 Jul 2019 14:23:02 +0000
(15:23 +0100)
src/wx/player_config_dialog.cc
patch
|
blob
|
history
diff --git
a/src/wx/player_config_dialog.cc
b/src/wx/player_config_dialog.cc
index 61b278a594473041bcfb3ae28222230d6e4c38c1..c1765eccb703d27de4f2954b2d8c484841d3d658 100644
(file)
--- a/
src/wx/player_config_dialog.cc
+++ b/
src/wx/player_config_dialog.cc
@@
-396,6
+396,14
@@
public:
return _("Watermark");
}
return _("Watermark");
}
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ /* XXX: this icon doesn't exist; this is just to make the swaroop variant build on OS X */
+ return wxBitmap ("watermark", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+
private:
void setup ()
{
private:
void setup ()
{
@@
-468,6
+476,14
@@
public:
return _("Devices");
}
return _("Devices");
}
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ /* XXX: this icon doesn't exist; this is just to make the swaroop variant build on OS X */
+ return wxBitmap ("devices", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+
private:
void setup ()
{
private:
void setup ()
{