cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fixes for wxUSE_UNICODE==0

Browse Source
This commit is contained in:
Paul Cornett 2017-11-12 09:35:12 -08:00
parent cdb9436975
commit 142004884f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/app.cpp
View File

@ -396,7 +396,11 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
// update internal arg[cv] as GTK+ may have removed processed options: // update internal arg[cv] as GTK+ may have removed processed options:
this->argc = argc_; this->argc = argc_;
#if wxUSE_UNICODE
this->argv.Init(argc_, argv_); this->argv.Init(argc_, argv_);
#else
this->argv = argv_;
#endif
if ( m_traits ) if ( m_traits )
{ {

2
src/gtk/toolbar.cpp
View File

@ -334,7 +334,7 @@ void wxToolBarTool::SetLabel(const wxString& label)
{ {
wxString newLabel = wxControl::RemoveMnemonics(label); wxString newLabel = wxControl::RemoveMnemonics(label);
gtk_tool_button_set_label(GTK_TOOL_BUTTON(m_item), 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. // To show the label for toolbar with wxTB_HORZ_LAYOUT.
gtk_tool_item_set_is_important(m_item, true); gtk_tool_item_set_is_important(m_item, true);
} }