recall initial font

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

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 96a5121bfabd62d0742a0dc7f1247733dec05625..5fafc36dbf2d00ce28a48ba8b0be1da4d719d301 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -197,6 +197,11 @@ int wxFontDialog::ShowModal()
     status = ATSUDisposeStyle(theStyle);
     check_noerr(status);
     
     status = ATSUDisposeStyle(theStyle);
     check_noerr(status);
     

+    //in case the user doesn't choose anything -
+    //if he doesn't we'll get a bad font with red text
+    m_fontData.SetChosenFont(m_fontData.GetInitialFont());
+    m_fontData.SetColour(wxColour(0,0,0));
+    

     //finally, show the font dialog
     if( (status = FPShowHideFontPanel()) == noErr)
     {
     //finally, show the font dialog
     if( (status = FPShowHideFontPanel()) == noErr)
     {