adding metafile and clipboard support

[wxWidgets.git] / src / mac / carbon / fontdlgosx.mm

diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm
index 532bde166cafdb11bf6a8f3d5744896a18b65dc8..baf8975be2d765ce56917715181805c0d199b8bb 100644 (file)
--- a/src/mac/carbon/fontdlgosx.mm
+++ b/src/mac/carbon/fontdlgosx.mm
@@ -209,18 +209,19 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
             ];
             
         wxASSERT_MSG(theDefaultFont, wxT("Invalid default font for wxCocoaFontDialog!"));
-     
-        //set the initial font of the NSFontPanel 
-        //(the font manager calls the appropriate NSFontPanel method)
-        [[NSFontManager sharedFontManager] setSelectedFont:theDefaultFont isMultiple:NO];
+
+        //Apple docs say to call NSFontManager::setSelectedFont
+        //However, 10.3 doesn't seem to create the font panel
+        //is this is done, so create it ourselves
+        [[NSFontPanel sharedFontPanel] setPanelFont:theDefaultFont isMultiple:NO];
 
     }
 
     if(m_fontData.m_fontColour.Ok())
         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:m_fontData.m_fontColour.Red() / 255.0
-                                        green:m_fontData.m_fontColour.Red() / 255.0
-                                        blue:m_fontData.m_fontColour.Red() / 255.0
+                                        green:m_fontData.m_fontColour.Green() / 255.0
+                                        blue:m_fontData.m_fontColour.Blue() / 255.0
                                         alpha:1.0]
         ];
     else