AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compilation fix for STL build after r65830.

Browse Source 
Explicit conversion from wxString to "const char *" is needed in STL build.
And even in non-STL build it's wrong to rely on implicit conversion as it
wouldn't work correctly in non-UTF-8 locales.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-10-16 23:05:15 +00:00
parent a9544d0014
commit b37e255c36
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/print.cpp
View File

@ -543,7 +543,7 @@ bool wxGtkPrintNativeData::TransferFrom( const wxPrintData &data )
default: break; default: break;
} }
gtk_print_settings_set_printer(m_config, data.GetPrinterName()); gtk_print_settings_set_printer(m_config, data.GetPrinterName().utf8_str());
return true; return true;
} }
@ -763,7 +763,9 @@ int wxGtkPageSetupDialog::ShowModal()
wxString title(GetTitle()); wxString title(GetTitle());
if ( title.empty() ) if ( title.empty() )
title = _("Page Setup"); title = _("Page Setup");
GtkWidget *dlg = gtk_page_setup_unix_dialog_new(title, GTK_WINDOW(m_parent->m_widget)); GtkWidget *
dlg = gtk_page_setup_unix_dialog_new(title.utf8_str(),
GTK_WINDOW(m_parent->m_widget));
gtk_page_setup_unix_dialog_set_print_settings( gtk_page_setup_unix_dialog_set_print_settings(
GTK_PAGE_SETUP_UNIX_DIALOG(dlg), nativeData); GTK_PAGE_SETUP_UNIX_DIALOG(dlg), nativeData);