Follow-up fix for GTK2 and GTK3 WX backends. v2.14.33
authorCarl Hetherington <cth@carlh.net>
Thu, 14 May 2020 20:46:58 +0000 (22:46 +0200)
committerCarl Hetherington <cth@carlh.net>
Thu, 14 May 2020 20:46:58 +0000 (22:46 +0200)
src/wx/timing_panel.cc

index 9ba2b18..f2fd659 100644 (file)
 #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