Build fixes for wxUSE_UNICODE==0

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 )
     {

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);
         }