diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-14 22:46:58 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-14 22:46:58 +0200 |
| commit | 9a3d7b896d4ec80a8f1fb9b5743c4c970d21691e (patch) | |
| tree | 38b4db6ad2182d5d24c5d083797c31013f881968 | |
| parent | c4861a3526ab3c4afc320ce70bdadd8fa944596b (diff) | |
Follow-up fix for GTK2 and GTK3 WX backends.v2.14.33
| -rw-r--r-- | src/wx/timing_panel.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 9ba2b186c..f2fd65930 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -36,6 +36,10 @@ #include "lib/dcp_content.h" #include "lib/ffmpeg_content.h" #include <dcp/locale_convert.h> +#if defined(__WXGTK20__) && !defined(__WXGTK3__) +#define TIMING_PANEL_ALIGNMENT_HACK 1 +#include <gtk/gtk.h> +#endif #include <boost/foreach.hpp> #include <set> #include <iostream> @@ -64,23 +68,23 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer) //// TRANSLATORS: this is an abbreviation for "hours" _h_label = new StaticText (this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX +#ifdef TIMING_PANEL_ALIGNMENT_HACK /* Hack to work around failure to centre text on GTK */ gtk_label_set_line_wrap (GTK_LABEL(_h_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "minutes" _m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX +#ifdef TIMING_PANEL_ALIGNMENT_HACK gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "seconds" _s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX +#ifdef TIMING_PANEL_ALIGNMENT_HACK gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE); #endif //// TRANSLATORS: this is an abbreviation for "frames" _f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); -#ifdef DCPOMATIC_LINUX +#ifdef TIMING_PANEL_ALIGNMENT_HACK gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE); #endif |