Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index bbdea6abf8c6174e57eb2c0298becf39b22a93e3..655d74bc43e0da80e3091d4fe0d271b22d881605 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -1,302 +1,316 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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"

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

-#if !USE_SHARED_LIBRARY

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

-#endif
-
-#define kMacOKAlertResourceID 128
-#define kMacYesNoAlertResourceID 129
-#define kMacYesNoCancelAlertResourceID 130
-#define kMacNoYesAlertResourceID 131
-#define kMacNoYesCancelAlertResourceID 132
-
-short language = 0 ;
-
-void wxMacConvertNewlines( const char *source , char * destination )
-{
-       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 ;
-}

 
 wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption,
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption,

-        long style, const wxPoint& pos)
+                                 long style, const wxPoint& pos)

 {
     m_caption = caption;
     m_message = message;
 {
     m_caption = caption;
     m_message = message;

-    m_dialogStyle = style;

     m_parent = parent;
     m_parent = parent;

+    SetMessageDialogStyle(style);

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

-       int resultbutton = wxID_CANCEL ;
+    int resultbutton = wxID_CANCEL ;
+
+    const long style = GetMessageDialogStyle();
+
+    wxASSERT_MSG( ( style & 0x3F ) != wxYES , wxT("this style is not supported on mac") ) ;

 
 

-       short result ;
-       Str255 pascalTitle ;
-       Str255 pascalText ;
-       
-       if (wxApp::s_macDefaultEncodingIsPC)
-       {
-               strcpy( (char*) pascalTitle , wxMacMakeMacStringFromPC( m_caption ) ) ;
-               strcpy( (char*) pascalText , wxMacMakeMacStringFromPC( m_message) ) ;
-       }
-       else
-       {
-               strcpy( (char*) pascalTitle , m_caption ) ;
-               strcpy( (char*) pascalText , m_message ) ;
-       }
+    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 ;

 
 

-       c2pstr( (char*) pascalTitle ) ;
-       wxMacConvertNewlines( (char*)pascalText ,(char*) pascalText) ;
-       c2pstr( (char*) pascalText ) ;
+#if TARGET_API_MAC_OSX
+    CFStringRef defaultButtonTitle = NULL ;
+    CFStringRef alternateButtonTitle = NULL ;
+    CFStringRef otherButtonTitle = NULL ;

 
 

-       wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ;
+    wxMacCFStringHolder cfTitle(m_caption , m_font.GetEncoding());
+    wxMacCFStringHolder cfText(m_message , m_font.GetEncoding());

 
 

-       if ( !UMAHasAppearance() )
-       {
-               int resourceID ;
-               
-         if (m_dialogStyle & wxYES_NO)
-         {
-           if (m_dialogStyle & wxCANCEL)
-             resourceID = kMacYesNoCancelAlertResourceID;
-           else
-             resourceID = kMacYesNoAlertResourceID + language * 10 ;
-         }
-         else if (m_dialogStyle & wxOK)
-         {
-           if (m_dialogStyle & wxCANCEL)
-             resourceID = kMacOKAlertResourceID; // wrong
-           else
-             resourceID = kMacOKAlertResourceID;
-         }
-               else
-               {
-                       return resultbutton ;
-               }
-       /*
-         if (hWnd)
-           msStyle |= MB_APPLMODAL;
-         else
-           msStyle |= MB_TASKMODAL;
-       */
+    wxMacCFStringHolder cfNoString(_("No") , m_font.GetEncoding()) ;
+    wxMacCFStringHolder cfYesString( _("Yes") , m_font.GetEncoding()) ;
+    wxMacCFStringHolder cfCancelString( _("Cancel") , 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 ;
+        if (style & wxCANCEL)
+        {
+            alternateButtonTitle = cfCancelString ;
+            buttonId[1] = wxID_CANCEL ;
+        }
+    }

 
 

-               ParamText( pascalTitle , pascalText , NULL , NULL ) ;
+    CFOptionFlags exitButton ;
+    OSStatus err = CFUserNotificationDisplayAlert ( 0 , alertType , NULL , NULL , NULL , cfTitle , cfText ,
+                                                    defaultButtonTitle , alternateButtonTitle , otherButtonTitle , &exitButton );
+    if ( err == noErr )
+        resultbutton = buttonId[exitButton] ;

 
 

-         if (m_dialogStyle & wxICON_EXCLAMATION)
-                               result = Alert( resourceID , NULL ) ;
-         else if (m_dialogStyle & wxICON_HAND)
-                       result = StopAlert( resourceID , NULL ) ;
-         else if (m_dialogStyle & wxICON_INFORMATION)
-                               result = NoteAlert( resourceID , NULL ) ;
-         else if (m_dialogStyle & wxICON_QUESTION)
-                               result = CautionAlert( resourceID , NULL ) ;
-               else
-                               result = Alert( resourceID , NULL ) ;
+#else
+    short result ;
+    
+#if TARGET_CARBON
+    if ( UMAGetSystemVersion() >= 0x1000 )
+    {
+        AlertStdCFStringAlertParamRec param ;
+        wxMacCFStringHolder cfNoString(_("No") , m_font.GetEncoding()) ;
+        wxMacCFStringHolder cfYesString( _("Yes") , m_font.GetEncoding()) ;

 
 

-               resultbutton = result ;
-               
-         if (m_dialogStyle & wxYES_NO)
-         {
-           if (m_dialogStyle & wxCANCEL)
-           {
-                               switch( result )
-                               {
-                                       case 1 :
-                                               resultbutton = wxID_YES ;
-                                               break ;
-                                       case 2 :
-                                               resultbutton = wxID_NO ;
-                                               break ;
-                                       case 3 :
-                                               resultbutton = wxID_CANCEL ;
-                                               break ;
-                               }
-           }
-           else
-           {
-                               switch( result )
-                               {
-                                       case 1 :
-                                               resultbutton = wxID_YES ;
-                                               break ;
-                                       case 2 :
-                                               resultbutton = wxID_NO ;
-                                               break ;
-                                       case 3 :
-                                               break ;
-                               }
-                       }
-               }
-       }
-       else
-       {
-               AlertStdAlertParamRec   param;
+        wxMacCFStringHolder cfTitle(m_caption , m_font.GetEncoding());
+        wxMacCFStringHolder cfText(m_message , m_font.GetEncoding());

 
 

-               param.movable           = true;
-               param.filterProc        = NULL ;
-               
-         if (m_dialogStyle & wxYES_NO)
-         {
-           if (m_dialogStyle & wxCANCEL)
-           {
-                               param.defaultText       = "\pYes" ;
-                               param.cancelText        = (StringPtr) kAlertDefaultCancelText;
-                               param.otherText         = "\pNo";
-                               param.helpButton        = false ;
-                               param.defaultButton = kAlertStdAlertOKButton;
-                               param.cancelButton      = kAlertStdAlertCancelButton;
-           }
-           else
-           {
-                               param.defaultText       = "\pYes" ;
-                               param.cancelText        = NULL;
-                               param.otherText         = "\pNo";
-                               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.movable = true;
+        param.flags = 0 ;
+        param.version = kStdCFStringAlertVersionOne ;

 
 

-               param.position          = 0;
+        bool skipDialog = false ;

 
 

-         if (m_dialogStyle & wxICON_EXCLAMATION)
-                               StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
-         else if (m_dialogStyle & wxICON_HAND)
-                               StandardAlert( kAlertStopAlert, pascalTitle, pascalText, &param, &result );
-         else if (m_dialogStyle & wxICON_INFORMATION)
-                       StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
-         else if (m_dialogStyle & wxICON_QUESTION)
-                               StandardAlert( kAlertCautionAlert, pascalTitle, pascalText, &param, &result );
-               else
-                               StandardAlert( kAlertPlainAlert, pascalTitle, pascalText, &param, &result );
+        if (style & wxYES_NO)
+        {
+            if (style & wxCANCEL)
+            {
+                param.defaultText     = cfYesString ;
+                param.cancelText     = (CFStringRef) kAlertDefaultCancelText;
+                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)
+            {
+                // thats a cancel missing
+                param.defaultText     = (CFStringRef) kAlertDefaultOKText ;
+                param.cancelText     = (CFStringRef) kAlertDefaultCancelText ;
+                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 ;
+        }
+        */

 
 

-               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 ;
+        param.position = kWindowDefaultPosition;
+        if ( !skipDialog )
+        {
+            DialogRef alertRef ;
+            CreateStandardAlert( alertType , cfTitle , cfText , &param , &alertRef ) ;
+            RunStandardAlert( alertRef , NULL , &result ) ;
+        }
+        if ( skipDialog )
+            return wxID_CANCEL ;
+    }
+    else
+#endif
+    {
+        AlertStdAlertParamRec    param;
+
+        Str255 yesPString ;
+        Str255 noPString ;
+
+        Str255 pascalTitle ;
+        Str255 pascalText ;
+        wxMacStringToPascal( m_caption , pascalTitle ) ;
+        wxMacStringToPascal( _("Yes") , yesPString ) ;
+        wxMacStringToPascal(  _("No") , noPString ) ;
+        wxMacStringToPascal( m_message , pascalText ) ;
+
+        param.movable         = true;
+        param.filterProc     = NULL ;
+        if (style & wxYES_NO)
+        {
+            if (style & 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 (style & wxOK)
+        {
+            if (style & wxCANCEL)
+            {
+                param.defaultText     = (StringPtr) kAlertDefaultOKText ;
+                param.cancelText     = (StringPtr) kAlertDefaultCancelText ;
+                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 (style & wxOK)
+    {
+        if (style & 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 (style & wxYES_NO)
+    {
+        if (style & 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 ;
+            }
+        }
+    }
+#endif
+    
+    return resultbutton ;

 }
 
 }