From af26d0438c952d9b7fb469c96aa5acf4c4ab8fb6 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 26 May 2020 12:11:04 -0400
Subject: [PATCH] FileDialogPrivate.* include our Internat.h for macro _ ...

... or (win) just don't use _ when writing to the log
---
 src/widgets/FileDialog/gtk/FileDialogPrivate.cpp | 2 ++
 src/widgets/FileDialog/mac/FileDialogPrivate.mm  | 2 ++
 src/widgets/FileDialog/win/FileDialogPrivate.cpp | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/widgets/FileDialog/gtk/FileDialogPrivate.cpp b/src/widgets/FileDialog/gtk/FileDialogPrivate.cpp
index a1054efc1..caa20d24d 100644
--- a/src/widgets/FileDialog/gtk/FileDialogPrivate.cpp
+++ b/src/widgets/FileDialog/gtk/FileDialogPrivate.cpp
@@ -26,6 +26,8 @@
 #include <wx/modalhook.h>
 #include <wx/sizer.h>
 
+#include "../../../Internat.h" // For macro _
+
 #define wxGTK_CONV(s) (s).utf8_str()
 #define wxGTK_CONV_FN(s) (s).fn_str()
 
diff --git a/src/widgets/FileDialog/mac/FileDialogPrivate.mm b/src/widgets/FileDialog/mac/FileDialogPrivate.mm
index 55ee44dbf..aaab5f96f 100644
--- a/src/widgets/FileDialog/mac/FileDialogPrivate.mm
+++ b/src/widgets/FileDialog/mac/FileDialogPrivate.mm
@@ -46,6 +46,8 @@
 
 #include <AppKit/AppKit.h>
 
+#include "../../../Internat.h" // For macro _
+
 // ============================================================================
 // implementation
 // ============================================================================
diff --git a/src/widgets/FileDialog/win/FileDialogPrivate.cpp b/src/widgets/FileDialog/win/FileDialogPrivate.cpp
index 0f95a7c9e..255c28761 100644
--- a/src/widgets/FileDialog/win/FileDialogPrivate.cpp
+++ b/src/widgets/FileDialog/win/FileDialogPrivate.cpp
@@ -881,7 +881,7 @@ static bool ShowCommFileDialog(OPENFILENAME *of, long style)
       // common dialog failed - why?
       if (errCode != 0)
       {
-         wxLogError(_("File dialog failed with error code %0lx."), errCode);
+         wxLogError(wxT("File dialog failed with error code %0lx."), errCode);
       }
       //else: it was just cancelled