default button on older systems was not shown with OK, but empty, resulting in wxID_CANCEL returns, patch 1473745
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -62,6 +62,7 @@ int wxMessageDialog::ShowModal()
|
||||
|
||||
wxMacCFStringHolder cfNoString( wxT("No"), m_font.GetEncoding() );
|
||||
wxMacCFStringHolder cfYesString( wxT("Yes"), m_font.GetEncoding() );
|
||||
wxMacCFStringHolder cfOKString( _("OK") , m_font.GetEncoding()) ;
|
||||
wxMacCFStringHolder cfCancelString( wxT("Cancel"), m_font.GetEncoding() );
|
||||
|
||||
int buttonId[4] = { 0, 0, 0, wxID_CANCEL /* time-out */ };
|
||||
@@ -92,6 +93,8 @@ int wxMessageDialog::ShowModal()
|
||||
{
|
||||
// the MSW implementation even shows an OK button if it is not specified, we'll do the same
|
||||
buttonId[0] = wxID_OK;
|
||||
// using null as default title does not work on earlier systems
|
||||
defaultButtonTitle = cfOKString;
|
||||
if (style & wxCANCEL)
|
||||
{
|
||||
alternateButtonTitle = cfCancelString;
|
||||
|
Reference in New Issue
Block a user