X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..30b72134651779476da2f783257ea63bc52d23de:/src/mac/msgdlg.cpp

diff --git a/src/mac/msgdlg.cpp b/src/mac/msgdlg.cpp
index f19da7bb4f..bbdea6abf8 100644
--- a/src/mac/msgdlg.cpp
+++ b/src/mac/msgdlg.cpp
@@ -16,7 +16,9 @@
 #include "wx/msgdlg.h"
 #include "wx/mac/uma.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
+#endif
 
 #define kMacOKAlertResourceID 128
 #define kMacYesNoAlertResourceID 129
@@ -70,12 +72,23 @@ 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 ;