build fixes

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

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 01d1d731ea875a8ae5fe4e30fe6e6eeee610504a..ade6197a84faffd33af9cbe026465e1f41bfcdd1 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -1,314 +1,285 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlg.cpp
+// Name:        src/mac/carbon/msgdlg.cpp

 // Purpose:     wxMessageDialog
 // Purpose:     wxMessageDialog

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "msgdlg.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/app.h"

 #include "wx/msgdlg.h"
 #include "wx/msgdlg.h"

-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+#endif
+

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY
+

 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)

-#endif

 
 

-short language = 0 ;

 
 

-void wxMacConvertNewlines( const char *source , char * destination ) ;
-void wxMacConvertNewlines( const char *source , char * destination )
+wxMessageDialog::wxMessageDialog(wxWindow *parent,
+                                 const wxString& message,
+                                 const wxString& caption,
+                                 long style,
+                                 const wxPoint& pos)
+               : wxMessageDialogBase(parent, message, caption, style)

 {
 {

-       const char *s = source ;
-       char *d = destination ;
-       
-       while( *s  )
-       {
-               switch( *s )
-               {
-                       case 0x0a :
-                               *d++ = 0x0d ;
-                               ++s ;
-                               break ;
-                       case 0x0d :
-                               *d++ = 0x0d ;
-                               ++s ;
-                               if ( *s == 0x0a )
-                                       ++s ;
-                               break ;
-                       default :
-                               *d++ = *s++ ;
-                               break ;
-               }
-       }
-       *d = 0 ;
+    m_yes = _("Yes");
+    m_no  = _("No");
+    m_ok  = _("OK");
+    m_cancel = _("Cancel");

 }
 
 }
 

-wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption,
-        long style, const wxPoint& pos)
+bool wxMessageDialog::SetYesNoLabels(const wxString& yes,const wxString& no)

 {
 {

-    m_caption = caption;
-    m_message = message;
-    m_dialogStyle = style;
-    m_parent = parent;
+    m_yes = yes;
+    m_no = no;
+    return true;
+}
+
+bool wxMessageDialog::SetYesNoCancelLabels(const wxString& yes, const wxString& no, const wxString& cancel)
+{
+    m_yes = yes;
+    m_no = no;
+    m_cancel = cancel;
+    return true;
+}
+
+bool wxMessageDialog::SetOKLabel(const wxString& ok)
+{
+    m_ok = ok;
+    return true;
+}
+
+bool wxMessageDialog::SetOKCancelLabels(const wxString& ok, const wxString& cancel)
+{
+    m_ok = ok;
+    m_cancel = cancel;
+    return true;

 }
 
 int wxMessageDialog::ShowModal()
 {
 }
 
 int wxMessageDialog::ShowModal()
 {

-       int resultbutton = wxID_CANCEL ;
-
-       short result ;
-
-       wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ;
-
-       AlertType alertType = kAlertPlainAlert ;
-       if (m_dialogStyle & wxICON_EXCLAMATION)
-               alertType = kAlertNoteAlert ;
-       else if (m_dialogStyle & wxICON_HAND)
-               alertType = kAlertStopAlert ;
-       else if (m_dialogStyle & wxICON_INFORMATION)
-               alertType = kAlertNoteAlert ;
-       else if (m_dialogStyle & wxICON_QUESTION)
-               alertType = kAlertCautionAlert ;
-
-#if TARGET_CARBON
-       if ( UMAGetSystemVersion() >= 0x1000 )
-       {
-               AlertStdCFStringAlertParamRec param ;
-               CFStringRef cfNoString = NULL ;
-               CFStringRef cfYesString = NULL ;
-
-               CFStringRef cfTitle = NULL;
-               CFStringRef cfText = NULL;
-               
-               cfTitle = wxMacCreateCFString( m_caption ) ;
-               cfText = wxMacCreateCFString( m_message ) ;
-               cfNoString = wxMacCreateCFString( _("No") ) ;
-               cfYesString = wxMacCreateCFString( _("Yes") ) ;
-               
-               param.movable = true;
-               param.flags = 0 ;
-               
-               bool skipDialog = false ;
-               
-               if (m_dialogStyle & wxYES_NO)
-               {
-                   if (m_dialogStyle & wxCANCEL)
-                   {
-                               param.defaultText       = cfYesString ;
-                               param.cancelText        = (CFStringRef) kAlertDefaultCancelText;
-                               param.otherText         = cfNoString ;
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = kAlertStdAlertCancelButton;
-                   }
-                   else
-                   {
-                               param.defaultText       = cfYesString ;
-                               param.cancelText        = NULL;
-                               param.otherText         = cfNoString ;
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = 0;
-                   }
-               }
-               else if (m_dialogStyle & wxOK)
-               {
-                   if (m_dialogStyle & wxCANCEL)
-                   {
-               // thats a cancel missing
-                               param.defaultText       = (CFStringRef) kAlertDefaultOKText ;
-                               param.cancelText        = NULL;
-                               param.otherText         = NULL;
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = 0;
-                   }
-                   else
-                   {
-                               param.defaultText       = (CFStringRef) kAlertDefaultOKText ;
-                               param.cancelText        = NULL;
-                               param.otherText         = NULL;
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = 0;
-                       }
-               }
-               else
-               {
-                       skipDialog = true ;
-               }
-               
-               param.position = kWindowDefaultPosition;
-               if ( !skipDialog )
-               {
-                       DialogRef alertRef ;
-                       CreateStandardAlert( alertType , cfTitle , cfText , &param , &alertRef ) ;
-                       RunStandardAlert( alertRef , NULL , &result ) ;
-               }
-               if(cfTitle != NULL)
-               CFRelease(cfTitle);   
-               if(cfText != NULL)
-               CFRelease(cfText);   
-               if(cfNoString != NULL)
-               CFRelease(cfNoString);   
-               if(cfYesString != NULL)
-               CFRelease(cfYesString);   
-       if ( skipDialog )
-               return wxID_CANCEL ;
-  }
-  else
+    int resultbutton = wxID_CANCEL;
+
+    const long style = GetMessageDialogStyle();
+
+    wxASSERT_MSG( (style & 0x3F) != wxYES, wxT("this style is not supported on Mac") );
+
+    AlertType alertType = kAlertPlainAlert;
+    if (style & wxICON_EXCLAMATION)
+        alertType = kAlertNoteAlert;
+    else if (style & wxICON_HAND)
+        alertType = kAlertStopAlert;
+    else if (style & wxICON_INFORMATION)
+        alertType = kAlertNoteAlert;
+    else if (style & wxICON_QUESTION)
+        alertType = kAlertCautionAlert;
+
+
+    // work out what to display
+    // if the extended text is empty then we use the caption as the title
+    // and the message as the text (for backwards compatibility)
+    // but if the extended message is not empty then we use the message as the title
+    // and the extended message as the text because that makes more sense
+
+    wxString msgtitle,msgtext;
+    if(m_extendedMessage.IsEmpty())
+    {
+        msgtitle = m_caption;
+        msgtext  = m_message;
+    }
+    else
+    {
+        msgtitle = m_message;
+        msgtext  = m_extendedMessage;
+    }
+
+
+#if TARGET_API_MAC_OSX
+    if ( !wxIsMainThread() )
+    {
+        CFStringRef defaultButtonTitle = NULL;
+        CFStringRef alternateButtonTitle = NULL;
+        CFStringRef otherButtonTitle = NULL;
+
+        wxMacCFStringHolder cfTitle( msgtitle, m_font.GetEncoding() );
+        wxMacCFStringHolder cfText( msgtext, m_font.GetEncoding() );
+
+        wxMacCFStringHolder cfNoString( m_no.c_str(), m_font.GetEncoding() );
+        wxMacCFStringHolder cfYesString( m_yes.c_str(), m_font.GetEncoding() );
+        wxMacCFStringHolder cfOKString( m_ok.c_str() , m_font.GetEncoding()) ;
+        wxMacCFStringHolder cfCancelString( m_cancel.c_str(), m_font.GetEncoding() );
+
+        int buttonId[4] = { 0, 0, 0, wxID_CANCEL /* time-out */ };
+
+        if (style & wxYES_NO)
+        {
+            if ( style & wxNO_DEFAULT )
+            {
+                defaultButtonTitle = cfNoString;
+                alternateButtonTitle = cfYesString;
+                buttonId[0] = wxID_NO;
+                buttonId[1] = wxID_YES;
+            }
+            else
+            {
+                defaultButtonTitle = cfYesString;
+                alternateButtonTitle = cfNoString;
+                buttonId[0] = wxID_YES;
+                buttonId[1] = wxID_NO;
+            }
+            if (style & wxCANCEL)
+            {
+                otherButtonTitle = cfCancelString;
+                buttonId[2] = wxID_CANCEL;
+            }
+        }
+        else
+        {
+            // 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;
+                buttonId[1] = wxID_CANCEL;
+            }
+        }
+
+        CFOptionFlags exitButton;
+        OSStatus err = CFUserNotificationDisplayAlert(
+            0, alertType, NULL, NULL, NULL, cfTitle, cfText,
+            defaultButtonTitle, alternateButtonTitle, otherButtonTitle, &exitButton );
+        if (err == noErr)
+            resultbutton = buttonId[exitButton];
+    }
+    else

 #endif
 #endif

-  {
-               AlertStdAlertParamRec   param;
-               char   cText[2048] ;
-               
-               if (wxApp::s_macDefaultEncodingIsPC)
-               {
-                       strcpy(cText , wxMacMakeMacStringFromPC( m_message) ) ;
-               }
-               else
-               {
-                       strcpy( cText , m_message ) ;
-               }
-               wxMacConvertNewlines( cText , cText ) ;
-       
-               Str255 yesPString ;
-               Str255 noPString ;
-
-               Str255 pascalTitle ;
-               Str255 pascalText ;
-               wxMacStringToPascal( m_caption , pascalTitle ) ;
-               wxMacStringToPascal( _("Yes") , yesPString ) ;
-               wxMacStringToPascal(  _("No") , noPString ) ;
-               CopyCStringToPascal( cText , pascalText ) ;
-               
-               param.movable           = true;
-       param.filterProc        = NULL ;
-               if (m_dialogStyle & wxYES_NO)
-               {
-                   if (m_dialogStyle & wxCANCEL)
-                   {
-                               param.defaultText       = yesPString ;
-                               param.cancelText        = (StringPtr) kAlertDefaultCancelText;
-                               param.otherText         = noPString ;
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = kAlertStdAlertCancelButton;
-                   }
-                   else
-                   {
-                               param.defaultText       = yesPString ;
-                               param.cancelText        = NULL;
-                               param.otherText         = noPString ;
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = 0;
-                   }
-               }
-               else if (m_dialogStyle & wxOK)
-               {
-                   if (m_dialogStyle & wxCANCEL)
-                   {
-               // thats a cancel missing
-                               param.defaultText       = (StringPtr) kAlertDefaultOKText ;
-                               param.cancelText        = NULL;
-                               param.otherText         = NULL;
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = 0;
-                   }
-                   else
-                   {
-                               param.defaultText       = (StringPtr) kAlertDefaultOKText ;
-                               param.cancelText        = NULL;
-                               param.otherText         = NULL;
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = 0;
-                       }
-               }
-               else
-               {
-                       return resultbutton ;
-               }
-
-               param.position          = 0;
-
-               StandardAlert( alertType, pascalTitle, pascalText, &param, &result );
-       }
-
-       if (m_dialogStyle & wxOK)
-       {
-               if (m_dialogStyle & wxCANCEL)                           
-               {
-                       //TODO add Cancelbutton
-                       switch( result )
-                       {
-                               case 1 :
-                                       resultbutton = wxID_OK ;
-                                       break ;
-                               case 2 :
-                                       break ;
-                               case 3 :
-                                       break ;
-                       }
-               }
-               else
-               {
-                       switch( result )
-                       {
-                               case 1 :
-                                       resultbutton = wxID_OK ;
-                                       break ;
-                               case 2 :
-                                       break ;
-                               case 3 :
-                                       break ;
-                       }
-               }
-       }
-       else if (m_dialogStyle & wxYES_NO)
-       {
-               if (m_dialogStyle & wxCANCEL)
-               {
-                       switch( result )
-                       {
-                               case 1 :
-                                       resultbutton = wxID_YES ;
-                                       break ;
-                               case 2 :
-                                       resultbutton = wxID_CANCEL ;
-                                       break ;
-                               case 3 :
-                                       resultbutton = wxID_NO ;
-                                       break ;
-                       }
-               }
-               else
-               {
-                       switch( result )
-                       {
-                               case 1 :
-                                       resultbutton = wxID_YES ;
-                                       break ;
-                               case 2 :
-                                       break ;
-                               case 3 :
-                                       resultbutton = wxID_NO ;
-                                       break ;
-                       }
-               }
-       } 
-
-       return resultbutton ;
-}
+    {
+        short result;
+
+        AlertStdCFStringAlertParamRec param;
+        wxMacCFStringHolder cfNoString( m_no.c_str(), m_font.GetEncoding() );
+        wxMacCFStringHolder cfYesString( m_yes.c_str(), m_font.GetEncoding() );
+        wxMacCFStringHolder cfOKString( m_ok.c_str(), m_font.GetEncoding() );
+        wxMacCFStringHolder cfCancelString( m_cancel.c_str(), m_font.GetEncoding() );
+
+        wxMacCFStringHolder cfTitle( msgtitle, m_font.GetEncoding() );
+        wxMacCFStringHolder cfText( msgtext, m_font.GetEncoding() );
+
+        param.movable = true;
+        param.flags = 0;
+        param.version = kStdCFStringAlertVersionOne;

 
 

+        bool skipDialog = false;
+
+        if (style & wxYES_NO)
+        {
+            if (style & wxCANCEL)
+            {
+                param.defaultText = cfYesString;
+                param.cancelText = cfCancelString;
+                param.otherText = cfNoString;
+                param.helpButton = false;
+                param.defaultButton = style & wxNO_DEFAULT ? kAlertStdAlertOtherButton : kAlertStdAlertOKButton;
+                param.cancelButton = kAlertStdAlertCancelButton;
+            }
+            else
+            {
+                param.defaultText = cfYesString;
+                param.cancelText = NULL;
+                param.otherText = cfNoString;
+                param.helpButton = false;
+                param.defaultButton = style & wxNO_DEFAULT ? kAlertStdAlertOtherButton : kAlertStdAlertOKButton;
+                param.cancelButton = 0;
+            }
+        }
+        // the MSW implementation even shows an OK button if it is not specified, we'll do the same
+        else
+        {
+            if (style & wxCANCEL)
+            {
+                // that's a cancel missing
+                param.defaultText = cfOKString;
+                param.cancelText = cfCancelString;
+                param.otherText = NULL;
+                param.helpButton = false;
+                param.defaultButton = kAlertStdAlertOKButton;
+                param.cancelButton = 0;
+            }
+            else
+            {
+                param.defaultText = cfOKString;
+                param.cancelText = NULL;
+                param.otherText = NULL;
+                param.helpButton = false;
+                param.defaultButton = kAlertStdAlertOKButton;
+                param.cancelButton = 0;
+            }
+        }
+
+        param.position = kWindowDefaultPosition;
+        if ( !skipDialog )
+        {
+            DialogRef alertRef;
+            CreateStandardAlert( alertType, cfTitle, cfText, &param, &alertRef );
+            RunStandardAlert( alertRef, NULL, &result );
+        }
+        else
+        {
+            return wxID_CANCEL;
+        }
+
+        if (style & wxOK)
+        {
+            switch ( result )
+            {
+            case 1:
+                resultbutton = wxID_OK;
+                break;
+
+            case 2:
+                // TODO: add Cancel button
+                // if (style & wxCANCEL)
+                //     resultbutton = wxID_CANCEL;
+                break;
+
+            case 3:
+            default:
+                break;
+            }
+        }
+        else if (style & wxYES_NO)
+        {
+            switch ( result )
+            {
+            case 1:
+                resultbutton = wxID_YES;
+                break;
+
+            case 2:
+                if (!(style & wxCANCEL))
+                    resultbutton = wxID_CANCEL;
+                break;
+
+            case 3:
+                resultbutton = wxID_NO;
+                break;
+
+            default:
+                break;
+            }
+        }
+    }
+
+    return resultbutton;
+}