projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add button to send test emails in the mail server prefs (#2216).
[dcpomatic.git]
/
src
/
wx
/
config_dialog.h
diff --git
a/src/wx/config_dialog.h
b/src/wx/config_dialog.h
index dd0e92152f191b936dc7ccf8d15a73f5645a7cc5..b7f3a269f9ac442e1cbe887cf30234da24c18daf 100644
(file)
--- a/
src/wx/config_dialog.h
+++ b/
src/wx/config_dialog.h
@@
-84,7
+84,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
- return wxBitmap
("general", wxBITMAP_TYPE_PNG_RESOURCE
);
+ return wxBitmap
(bitmap_path("general"), wxBITMAP_TYPE_PNG
);
}
#endif
}
#endif
@@
-161,7
+161,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
- return wxBitmap
("keys", wxBITMAP_TYPE_PNG_RESOURCE
);
+ return wxBitmap
(bitmap_path("keys"), wxBITMAP_TYPE_PNG
);
}
#endif
}
#endif
@@
-176,6
+176,7
@@
private:
void signing_advanced ();
void export_decryption_chain_and_key ();
void import_decryption_chain_and_key ();
void signing_advanced ();
void export_decryption_chain_and_key ();
void import_decryption_chain_and_key ();
+ void remake_signing ();
};
};
@@
-191,7
+192,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
- return wxBitmap
("sound", wxBITMAP_TYPE_PNG_RESOURCE
);
+ return wxBitmap
(bitmap_path("sound"), wxBITMAP_TYPE_PNG
);
}
#endif
}
#endif