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

default button on older systems was not shown with OK, but empty, resulting in wxID_CANCEL returns, patch 1473745

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-04-26 16:08:11 +00:00
parent 67533115f9
commit c8e597f84a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mac/carbon/msgdlg.cpp
View File

@@ -62,6 +62,7 @@ int wxMessageDialog::ShowModal()
wxMacCFStringHolder cfNoString( wxT("No"), m_font.GetEncoding() ); wxMacCFStringHolder cfNoString( wxT("No"), m_font.GetEncoding() );
wxMacCFStringHolder cfYesString( wxT("Yes"), m_font.GetEncoding() ); wxMacCFStringHolder cfYesString( wxT("Yes"), m_font.GetEncoding() );
wxMacCFStringHolder cfOKString( _("OK") , m_font.GetEncoding()) ;
wxMacCFStringHolder cfCancelString( wxT("Cancel"), m_font.GetEncoding() ); wxMacCFStringHolder cfCancelString( wxT("Cancel"), m_font.GetEncoding() );
int buttonId[4] = { 0, 0, 0, wxID_CANCEL /* time-out */ }; 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 // the MSW implementation even shows an OK button if it is not specified, we'll do the same
buttonId[0] = wxID_OK; buttonId[0] = wxID_OK;
// using null as default title does not work on earlier systems
defaultButtonTitle = cfOKString;
if (style & wxCANCEL) if (style & wxCANCEL)
{ {
alternateButtonTitle = cfCancelString; alternateButtonTitle = cfCancelString;