Fixed compile errors, warnings and other DSMs, and improved comments.

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

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index cf229e520008140529f009f37dd7cbfedda33d15..20186c5ecfe0415a77281e5fd3847e67793937ca 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -13,10 +13,14 @@
 #pragma implementation "msgdlg.h"
 #endif
 
 #pragma implementation "msgdlg.h"
 #endif
 

+#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 kMacOKAlertResourceID 128
 #define kMacYesNoAlertResourceID 129


@@ -26,6 +30,7 @@ IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 short language = 0 ;
 
 
 short language = 0 ;
 

+void wxMacConvertNewlines( const char *source , char * destination ) ;

 void wxMacConvertNewlines( const char *source , char * destination )
 {
        const char *s = source ;
 void wxMacConvertNewlines( const char *source , char * destination )
 {
        const char *s = source ;


@@ -69,22 +74,26 @@ int wxMessageDialog::ShowModal()
        short result ;
        Str255 pascalTitle ;
        Str255 pascalText ;
        short result ;
        Str255 pascalTitle ;
        Str255 pascalText ;

+       char   cText[256] ;
+
+       Str255 yesPString ;
+       Str255 noPString ;

        
        

+       wxMacStringToPascal( m_caption , pascalTitle ) ;
+       wxMacStringToPascal( _("Yes") , yesPString ) ;
+       wxMacStringToPascal(  _("No") , noPString ) ;

        
        if (wxApp::s_macDefaultEncodingIsPC)
        {
        
        if (wxApp::s_macDefaultEncodingIsPC)
        {

-               strcpy( (char*) pascalTitle , wxMacMakeMacStringFromPC( m_caption ) ) ;
-               strcpy( (char*) pascalText , wxMacMakeMacStringFromPC( m_message) ) ;
+               strcpy(cText , wxMacMakeMacStringFromPC( m_message) ) ;

        }
        else
        {
        }
        else
        {

-               strcpy( (char*) pascalTitle , m_caption ) ;
-               strcpy( (char*) pascalText , m_message ) ;
+               strcpy( cText , m_message ) ;

        }
 
        }
 

-       c2pstr( (char*) pascalTitle ) ;
-       wxMacConvertNewlines( (char*)pascalText ,(char*) pascalText) ;
-       c2pstr( (char*) pascalText ) ;
+       wxMacConvertNewlines( cText , cText ) ;
+       CopyCStringToPascal( cText , pascalText ) ;

 
        wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ;
 
 
        wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ;
 


@@ -176,18 +185,18 @@ int wxMessageDialog::ShowModal()
          {
            if (m_dialogStyle & wxCANCEL)
            {
          {
            if (m_dialogStyle & wxCANCEL)
            {

-                               param.defaultText       = "\pYes" ;
+                               param.defaultText       = yesPString ;

                                param.cancelText        = (StringPtr) kAlertDefaultCancelText;
                                param.cancelText        = (StringPtr) kAlertDefaultCancelText;

-                               param.otherText         = "\pNo";
+                               param.otherText         = noPString ;

                                param.helpButton        = false ;
                                param.defaultButton = kAlertStdAlertOKButton;
                                param.cancelButton      = kAlertStdAlertCancelButton;
            }
            else
            {
                                param.helpButton        = false ;
                                param.defaultButton = kAlertStdAlertOKButton;
                                param.cancelButton      = kAlertStdAlertCancelButton;
            }
            else
            {

-                               param.defaultText       = "\pYes" ;
+                               param.defaultText       = yesPString ;

                                param.cancelText        = NULL;
                                param.cancelText        = NULL;

-                               param.otherText         = "\pNo";
+                               param.otherText         = noPString ;

                                param.helpButton        = false ;
                                param.defaultButton = kAlertStdAlertOKButton;
                                param.cancelButton      = 0;
                                param.helpButton        = false ;
                                param.defaultButton = kAlertStdAlertOKButton;
                                param.cancelButton      = 0;