projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f23a046
)
Fix wx3.1 crash.
author
Carl Hetherington
<cth@carlh.net>
Wed, 18 Oct 2017 22:34:31 +0000
(23:34 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 18 Oct 2017 22:34:31 +0000
(23:34 +0100)
src/wx/video_panel.cc
patch
|
blob
|
history
diff --git
a/src/wx/video_panel.cc
b/src/wx/video_panel.cc
index 462f2bdae3925ceb69aae168a1a8afba0f92937e..fcd7af30a34b56ce004f1a54bbda05f36797effe 100644
(file)
--- a/
src/wx/video_panel.cc
+++ b/
src/wx/video_panel.cc
@@
-184,7
+184,7
@@
VideoPanel::VideoPanel (ContentPanel* p)
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
- s->Add (_filters, 1, wx
EXPAND | wx
ALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+ s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
@@
-204,7
+204,7
@@
VideoPanel::VideoPanel (ContentPanel* p)
/// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
_colour_conversion->Append (S_("Colour|Custom"));
/// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
_colour_conversion->Append (S_("Colour|Custom"));
- s->Add (_colour_conversion, 1, wx
EXPAND | wx
ALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+ s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
_edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
_edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);