Hardware defines spec.

[wxWidgets.git] / src / mac / carbon / fontdlg.cpp

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 236cbb85185cc76e0ae558315e2705be66cd89cb..892d0df454a6cf70a5a4f86d5e2b5cd2eb00cca7 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -29,10 +29,11 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/mac/fontdlg.h"
     #include "wx/cmndata.h"
 #endif
 
+#include "wx/mac/fontdlg.h"
+    
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 #endif
@@ -46,6 +47,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 #include "wx/msgdlg.h"
 
+//color isn't working in carbon impl
+#define ISCOLORWORKING 0
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -65,7 +69,9 @@ pascal OSStatus wxFontDialogEventHandler(     EventHandlerCallRef inHandlerCallRef,
     FMFontFamily fontfamily;
     FMFontStyle fontstyle;
     FMFontSize fontsize;
+#if ISCOLORWORKING
     RGBColor fontcolor;
+#endif
         
     status = GetEventParameter (event, kEventParamFMFontFamily,
                                     typeFMFontFamily, NULL,
@@ -86,19 +92,23 @@ pascal OSStatus wxFontDialogEventHandler(   EventHandlerCallRef inHandlerCallRef,
 
     check_noerr (status);
 
+#if ISCOLORWORKING
     status = GetEventParameter (event, kEventParamFontColor,
                                     typeRGBColor, NULL,
                                     sizeof( RGBColor ), NULL, &fontcolor); 
     check_noerr (status);
+#endif
     
     //now do the conversion to the wx font data
     wxFontData theFontData;
     wxFont        theFont;
- 
+
+#if ISCOLORWORKING 
     //set color
     wxColour theColor;
     theColor.Set(&(WXCOLORREF&)fontcolor);
     theFontData.SetColour(theColor);
+#endif
         
     //set size
     theFont.SetPointSize(fontsize);
@@ -234,7 +244,7 @@ int wxFontDialog::ShowModal()
         while(FPIsFontPanelVisible()) 
         {
             //yeild so we can get events
-            ::wxSafeYield(m_dialogParent, false);
+            wxTheApp->Yield(false);
         }
     }
     else