add wxGTK_CONVs to fix STL and ANSI builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -196,12 +196,14 @@ void wxMessageDialog::GTKCreateMsgDialog()
|
|||||||
{
|
{
|
||||||
if ( addButtons )
|
if ( addButtons )
|
||||||
{
|
{
|
||||||
gtk_dialog_add_button(dlg, GetNoLabel(), GTK_RESPONSE_NO);
|
gtk_dialog_add_button(dlg, wxGTK_CONV(GetNoLabel()),
|
||||||
gtk_dialog_add_button(dlg, GetYesLabel(), GTK_RESPONSE_YES);
|
GTK_RESPONSE_NO);
|
||||||
|
gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()),
|
||||||
|
GTK_RESPONSE_YES);
|
||||||
|
|
||||||
if ( m_dialogStyle & wxCANCEL )
|
if ( m_dialogStyle & wxCANCEL )
|
||||||
{
|
{
|
||||||
gtk_dialog_add_button(dlg, GetCancelLabel(),
|
gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
|
||||||
GTK_RESPONSE_CANCEL);
|
GTK_RESPONSE_CANCEL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -213,9 +215,12 @@ void wxMessageDialog::GTKCreateMsgDialog()
|
|||||||
}
|
}
|
||||||
else if ( addButtons ) // Ok or Ok/Cancel dialog
|
else if ( addButtons ) // Ok or Ok/Cancel dialog
|
||||||
{
|
{
|
||||||
gtk_dialog_add_button(dlg, GetOKLabel(), GTK_RESPONSE_OK);
|
gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK);
|
||||||
if ( m_dialogStyle & wxCANCEL )
|
if ( m_dialogStyle & wxCANCEL )
|
||||||
gtk_dialog_add_button(dlg, GetCancelLabel(), GTK_RESPONSE_CANCEL);
|
{
|
||||||
|
gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
|
||||||
|
GTK_RESPONSE_CANCEL);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user