X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e69ff22681b5625f52c2b4c7e47c1815df7c306..de1b0aeb6ca71f915479d07e040b1d65e5096951:/src/mac/carbon/fontdlgosx.mm

diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm
index 7bc885bd3c..968d740727 100644
--- a/src/mac/carbon/fontdlgosx.mm
+++ b/src/mac/carbon/fontdlgosx.mm
@@ -17,23 +17,10 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
-#pragma implementation "fontdlg.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/cmndata.h"
-    #include "wx/fontdlg.h"
-    #include "wx/fontutil.h"
-    #include "wx/log.h"
-#endif
+#include "wx/cmndata.h"
+#include "wx/fontdlg.h"
+#include "wx/fontutil.h"
+#include "wx/log.h"
     
 // ============================================================================
 // implementation
@@ -42,9 +29,7 @@
 //Mac OSX 10.2+ only
 #if USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
-#endif
 
 // Cocoa headers
 #include "wx/cocoa/autorelease.h"
@@ -222,18 +207,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
@@ -277,7 +263,7 @@ int wxFontDialog::ShowModal()
     //
     //	So we set up delegates for both the color and font panels,
     //  and the if the font panel opens the color panel, we 
-    //  stop the modal loop, and start a seperate modal loop for
+    //  stop the modal loop, and start a separate modal loop for
     //  the color panel until the color panel closes, switching
     //  back to the font panel modal loop once it does close.
     //