merge with latest sources

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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,7 +72,6 @@ int wxMessageDialog::ShowModal()
 	Str255 pascalTitle ;
 	Str255 pascalText ;
 	
-	
 	if (wxApp::s_macDefaultEncodingIsPC)
 	{
 		strcpy( (char*) pascalTitle , wxMacMakeMacStringFromPC( m_caption ) ) ;