From 142004884f11b094446be844b9a95ae5c4fffe88 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 12 Nov 2017 09:35:12 -0800
Subject: [PATCH] Build fixes for wxUSE_UNICODE==0

---
 src/gtk/app.cpp     | 4 ++++
 src/gtk/toolbar.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index a27fc2aa82..0be93fc816 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -396,7 +396,11 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
 
     // update internal arg[cv] as GTK+ may have removed processed options:
     this->argc = argc_;
+#if wxUSE_UNICODE
     this->argv.Init(argc_, argv_);
+#else
+    this->argv = argv_;
+#endif
 
     if ( m_traits )
     {
diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp
index cc1dcc794c..a439111e81 100644
--- a/src/gtk/toolbar.cpp
+++ b/src/gtk/toolbar.cpp
@@ -334,7 +334,7 @@ void wxToolBarTool::SetLabel(const wxString& label)
         {
             wxString newLabel = wxControl::RemoveMnemonics(label);
             gtk_tool_button_set_label(GTK_TOOL_BUTTON(m_item),
-                                      wxGTK_CONV(newLabel));
+                                      wxGTK_CONV_SYS(newLabel));
             // To show the label for toolbar with wxTB_HORZ_LAYOUT.
             gtk_tool_item_set_is_important(m_item, true);
         }