crush compiler warnings and handle out of memory errors slightly better

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

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 96a5121bfabd62d0742a0dc7f1247733dec05625..892d0df454a6cf70a5a4f86d5e2b5cd2eb00cca7 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -9,25 +9,55 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #pragma implementation "fontdlg.h"
 #endif
 
 #ifdef __GNUG__
 #pragma implementation "fontdlg.h"
 #endif
 

-#include "wx/mac/fontdlg.h"
-#include "wx/cmndata.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif

 
 

+#ifndef WX_PRECOMP
+    #include "wx/cmndata.h"
+#endif
+
+#include "wx/mac/fontdlg.h"
+    

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 #endif
 
 #include "wx/mac/private.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 #endif
 
 #include "wx/mac/private.h"
 

+//Mac OSX 10.2+ only

 #if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
 
 #include <ATSUnicode.h>
 
 #include "wx/msgdlg.h"
 
 #if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
 
 #include <ATSUnicode.h>
 
 #include "wx/msgdlg.h"
 

+//color isn't working in carbon impl
+#define ISCOLORWORKING 0
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ---------------------------------------------------------------------------
+// Carbon event callback(s)
+// ---------------------------------------------------------------------------
+

 pascal OSStatus wxFontDialogEventHandler(      EventHandlerCallRef inHandlerCallRef,
                                                                        EventRef event, void* pData)
 {
 pascal OSStatus wxFontDialogEventHandler(      EventHandlerCallRef inHandlerCallRef,
                                                                        EventRef event, void* pData)
 {


@@ -39,7 +69,9 @@ pascal OSStatus wxFontDialogEventHandler(     EventHandlerCallRef inHandlerCallRef,
     FMFontFamily fontfamily;
     FMFontStyle fontstyle;
     FMFontSize fontsize;
     FMFontFamily fontfamily;
     FMFontStyle fontstyle;
     FMFontSize fontsize;

+#if ISCOLORWORKING

     RGBColor fontcolor;
     RGBColor fontcolor;

+#endif

         
     status = GetEventParameter (event, kEventParamFMFontFamily,
                                     typeFMFontFamily, NULL,
         
     status = GetEventParameter (event, kEventParamFMFontFamily,
                                     typeFMFontFamily, NULL,


@@ -60,19 +92,23 @@ pascal OSStatus wxFontDialogEventHandler(   EventHandlerCallRef inHandlerCallRef,
 
     check_noerr (status);
 
 
     check_noerr (status);
 

+#if ISCOLORWORKING

     status = GetEventParameter (event, kEventParamFontColor,
                                     typeRGBColor, NULL,
                                     sizeof( RGBColor ), NULL, &fontcolor); 
     check_noerr (status);
     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;
     
     //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);
     //set color
     wxColour theColor;
     theColor.Set(&(WXCOLORREF&)fontcolor);
     theFontData.SetColour(theColor);

+#endif

         
     //set size
     theFont.SetPointSize(fontsize);
         
     //set size
     theFont.SetPointSize(fontsize);


@@ -99,9 +135,9 @@ pascal OSStatus wxFontDialogEventHandler(    EventHandlerCallRef inHandlerCallRef,
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxFontDialogEventHandler );
 
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxFontDialogEventHandler );
 

-//---------------------------
-//     Class implementation
-//---------------------------
+// ---------------------------------------------------------------------------
+// wxFontDialog
+// ---------------------------------------------------------------------------

 
 wxFontDialog::wxFontDialog() :
     m_dialogParent(NULL), m_pEventHandlerRef(NULL)
 
 wxFontDialog::wxFontDialog() :
     m_dialogParent(NULL), m_pEventHandlerRef(NULL)


@@ -197,13 +233,18 @@ 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)
     {
         while(FPIsFontPanelVisible()) 
         {
             //yeild so we can get events
     //finally, show the font dialog
     if( (status = FPShowHideFontPanel()) == noErr)
     {
         while(FPIsFontPanelVisible()) 
         {
             //yeild so we can get events

-            ::wxSafeYield(m_dialogParent, false);
+            wxTheApp->Yield(false);

         }
     }
     else
         }
     }
     else


@@ -216,10 +257,9 @@ int wxFontDialog::ShowModal()
 #else
    //10.2+ only
    
 #else
    //10.2+ only
    

-   
-//
-//     no native implementation
-//
+// ---------------------------------------------------------------------------
+// wxFontDialog stub for mac OS's without a native font dialog
+// ---------------------------------------------------------------------------

 
 wxFontDialog::wxFontDialog()
 {
 
 wxFontDialog::wxFontDialog()
 {