Amebis/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
2018-02-10 08:49:25 -08:00
parent 6300f151fb
commit 32fe8b4b43
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/assertdlg_gtk.cpp
View File

@@ -177,8 +177,8 @@ static void gtk_assert_dialog_save_backtrace_callback(GtkWidget*, GtkAssertDialo
dialog = gtk_file_chooser_dialog_new ("Save assert info to file", GTK_WINDOW(dlg), dialog = gtk_file_chooser_dialog_new ("Save assert info to file", GTK_WINDOW(dlg),
GTK_FILE_CHOOSER_ACTION_SAVE, GTK_FILE_CHOOSER_ACTION_SAVE,
static_cast<const char*>(wxGTK_CONV(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_CANCEL)))), GTK_RESPONSE_CANCEL, static_cast<const char*>(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_CANCEL)).utf8_str()), GTK_RESPONSE_CANCEL,
static_cast<const char*>(wxGTK_CONV(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_SAVE)))), GTK_RESPONSE_ACCEPT, static_cast<const char*>(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_SAVE)).utf8_str()), GTK_RESPONSE_ACCEPT,
NULL); NULL);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)

2
src/gtk/button.cpp
View File

@@ -183,7 +183,7 @@ wxSize wxButtonBase::GetDefaultSize()
GtkWidget *box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); GtkWidget *box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0) #if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
wxString labelGTK = GTKConvertMnemonics(wxGetStockLabel(wxID_CANCEL)); wxString labelGTK = GTKConvertMnemonics(wxGetStockLabel(wxID_CANCEL));
GtkWidget *btn = gtk_button_new_with_mnemonic(wxGTK_CONV(labelGTK)); GtkWidget *btn = gtk_button_new_with_mnemonic(labelGTK.utf8_str());
#else #else
GtkWidget *btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL); GtkWidget *btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
#endif // GTK >= 3.10 / < 3.10 #endif // GTK >= 3.10 / < 3.10