Another build fix (for non-Linux this time).

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index af62b557cb5235b17432f94b3e2a9a3b9a5d5fc9..973eacf5d901f48db06e334dd985b846e3959686 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -36,7 +36,8 @@
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
 #include <dcp/locale_convert.h>
-#ifndef __WXGTK3__
+#if defined(__WXGTK20__) && !defined(__WXGTK3__)
+#define TIMING_PANEL_ALIGNMENT_HACK 1
 #include <gtk/gtk.h>
 #endif
 #include <boost/foreach.hpp>
@@ -68,23 +69,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);
-#ifndef __WXGTK3__
+#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);
-#ifndef __WXGTK3__
+#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);
-#ifndef __WXGTK3__
+#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);
-#ifndef __WXGTK3__
+#ifdef TIMING_PANEL_ALIGNMENT_HACK
        gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE);
 #endif