X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e118897acbde8eac6e3f67d1bb439a1fc572660c..b0ea5d96038f143169458ba032451427bbf93b3a:/src/mac/msgdlg.cpp?ds=sidebyside

diff --git a/src/mac/msgdlg.cpp b/src/mac/msgdlg.cpp
index 7b7109b668..732a2f48ba 100644
--- a/src/mac/msgdlg.cpp
+++ b/src/mac/msgdlg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        msgdlg.cpp
 // Purpose:     wxMessageDialog
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -27,33 +27,33 @@ short language = 0 ;
 void wxMacConvertNewlines( const char *source , char * destination ) ;
 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 ;
+    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,
-        long style, const wxPoint& pos)
+                                 long style, const wxPoint& pos)
 {
     m_caption = caption;
     m_message = message;
@@ -63,164 +63,255 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, cons
 
 int wxMessageDialog::ShowModal()
 {
-	int resultbutton = wxID_CANCEL ;
-
-	short result ;
-	Str255 pascalTitle ;
-	Str255 pascalText ;
-	char   cText[2048] ;
-
-	Str255 yesPString ;
-	Str255 noPString ;
-	
-	wxMacStringToPascal( m_caption , pascalTitle ) ;
-	wxMacStringToPascal( _("Yes") , yesPString ) ;
-	wxMacStringToPascal(  _("No") , noPString ) ;
-	
-	if (wxApp::s_macDefaultEncodingIsPC)
-	{
-		strcpy(cText , wxMacMakeMacStringFromPC( m_message) ) ;
-	}
-	else
-	{
-		strcpy( cText , m_message ) ;
-	}
-
-	wxMacConvertNewlines( cText , cText ) ;
-	CopyCStringToPascal( cText , pascalText ) ;
-
-	wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ;
-
-
-	AlertStdAlertParamRec	param;
-
-	param.movable 		= true;
-	param.filterProc 	= NULL ;
-	
-  if (m_dialogStyle & wxYES_NO)
-  {
-    if (m_dialogStyle & wxCANCEL)
+    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 )
     {
-			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;
+        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;
+            }
+        }
+        // the msw implementation even shows an ok button if it is not specified, we'll do the same
+        else 
+        {
+            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
+#endif
     {
-			param.defaultText 	= (StringPtr) kAlertDefaultOKText ;
-			param.cancelText 	= NULL;
-			param.otherText 	= NULL;
-			param.helpButton 	= false ;
-			param.defaultButton = kAlertStdAlertOKButton;
-			param.cancelButton 	= 0;
+        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 );
     }
-  }
-	else
-	{
-		return resultbutton ;
-	}
-
-	param.position 		= 0;
-
-  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 (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)
+    
+    if (m_dialogStyle & wxOK)
     {
-			switch( result )
-			{
-				case 1 :
-					resultbutton = wxID_YES ;
-					break ;
-				case 2 :
-					resultbutton = wxID_CANCEL ;
-					break ;
-				case 3 :
-					resultbutton = wxID_NO ;
-					break ;
-			}
+        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
+    else if (m_dialogStyle & wxYES_NO)
     {
-			switch( result )
-			{
-				case 1 :
-					resultbutton = wxID_YES ;
-					break ;
-				case 2 :
-					break ;
-				case 3 :
-					resultbutton = wxID_NO ;
-					break ;
-			}
-		}
-	} 
-
-	return resultbutton ;
+        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 ;
 }