Added wxDC::GetAsBitmap, and implemented wxWindowDC::DoGetAsBitmap on OS X, in order...

[wxWidgets.git] / src / mac / carbon / msgdlg.cpp

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 8b7fed15a70d3c7d62da072316f32790066f5cc7..fe6cf21729473505da280cda686b889a70f02737 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/mac/uma.h"
 
 
@@ -60,9 +60,10 @@ int wxMessageDialog::ShowModal()
     wxMacCFStringHolder cfTitle( m_caption, m_font.GetEncoding() );
     wxMacCFStringHolder cfText( m_message, m_font.GetEncoding() );
 
-    wxMacCFStringHolder cfNoString( wxT("No"), m_font.GetEncoding() );
-    wxMacCFStringHolder cfYesString( wxT("Yes"), m_font.GetEncoding() );
-    wxMacCFStringHolder cfCancelString( wxT("Cancel"), m_font.GetEncoding() );
+    wxMacCFStringHolder cfNoString( _("No"), m_font.GetEncoding() );
+    wxMacCFStringHolder cfYesString( _("Yes"), m_font.GetEncoding() );
+    wxMacCFStringHolder cfOKString( _("OK") , m_font.GetEncoding()) ;
+    wxMacCFStringHolder cfCancelString( _("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;
@@ -113,8 +116,8 @@ int wxMessageDialog::ShowModal()
     if ( UMAGetSystemVersion() >= 0x1000 )
     {
         AlertStdCFStringAlertParamRec param;
-        wxMacCFStringHolder cfNoString( wxT("No"), m_font.GetEncoding() );
-        wxMacCFStringHolder cfYesString( wxT("Yes"), m_font.GetEncoding() );
+        wxMacCFStringHolder cfNoString( _("No"), m_font.GetEncoding() );
+        wxMacCFStringHolder cfYesString( _("Yes"), m_font.GetEncoding() );
 
         wxMacCFStringHolder cfTitle( m_caption, m_font.GetEncoding() );
         wxMacCFStringHolder cfText( m_message, m_font.GetEncoding() );
@@ -196,8 +199,8 @@ int wxMessageDialog::ShowModal()
         Str255 pascalTitle, pascalText;
 
         wxMacStringToPascal( m_caption, pascalTitle );
-        wxMacStringToPascal( wxT("Yes"), yesPString );
-        wxMacStringToPascal( wxT("No"), noPString );
+        wxMacStringToPascal( _("Yes"), yesPString );
+        wxMacStringToPascal( _("No"), noPString );
         wxMacStringToPascal( m_message, pascalText );
 
         param.movable = true;