fixed (rare but fatal) bug in wxWindowDisabler

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

diff --git a/src/mac/msgdlg.cpp b/src/mac/msgdlg.cpp
index 5aa8554038e4959c5e492e2f80a5c1c413f5f1ec..cf229e520008140529f009f37dd7cbfedda33d15 100644 (file)
--- a/src/mac/msgdlg.cpp
+++ b/src/mac/msgdlg.cpp
@@ -16,9 +16,7 @@
 #include "wx/msgdlg.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
-#endif
 
 #define kMacOKAlertResourceID 128
 #define kMacYesNoAlertResourceID 129
@@ -72,12 +70,24 @@ int wxMessageDialog::ShowModal()
        Str255 pascalTitle ;
        Str255 pascalText ;
        
-       strcpy( (char*) pascalTitle , m_caption ) ;
+       
+       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 ) ;
+       }
+
        c2pstr( (char*) pascalTitle ) ;
-       strcpy( (char*) pascalText , m_message ) ;
        wxMacConvertNewlines( (char*)pascalText ,(char*) pascalText) ;
        c2pstr( (char*) pascalText ) ;
 
+       wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ;
+
        if ( !UMAHasAppearance() )
        {
                int resourceID ;