Corrected wxRTTI for wxNotebook so dynamic casting to wxBookCtrlBase works

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

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 5fafc36dbf2d00ce28a48ba8b0be1da4d719d301..7c037fc8b42fa5689e23b15fb5ffbc91e9495f28 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlg.cpp
+// Name:        src/mac/carbon/fontdlg.cpp

 // Purpose:     wxFontDialog class for carbon 10.2+.
 // Author:      Ryan Norton
 // Modified by:
 // Purpose:     wxFontDialog class for carbon 10.2+.
 // Author:      Ryan Norton
 // Modified by:


@@ -9,102 +9,187 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "fontdlg.h"
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_FONTDLG
+
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/mac/fontdlg.h"
-#include "wx/cmndata.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/crt.h"
+    #include "wx/dcclient.h"
+    #include "wx/frame.h"
+    #include "wx/textctrl.h"
+    #include "wx/listbox.h"
+    #include "wx/checkbox.h"
+    #include "wx/choice.h"
+    #include "wx/sizer.h"
+    #include "wx/stattext.h"
+    #include "wx/button.h"
+#endif
+
+#include "wx/fontdlg.h"
+
+#if wxMAC_USE_EXPERIMENTAL_FONTDIALOG

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)

-#endif

 
 

-#include "wx/mac/private.h"
+#include "wx/mac/uma.h"

 
 

-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+// ---------------------------------------------------------------------------
+// wxFontDialog
+// ---------------------------------------------------------------------------

 
 

-#include <ATSUnicode.h>
+static const EventTypeSpec eventList[] =
+{
+    { kEventClassFont, kEventFontSelection } ,
+} ;

 
 

-#include "wx/msgdlg.h"

 
 

-pascal OSStatus wxFontDialogEventHandler(      EventHandlerCallRef inHandlerCallRef,
-                                                                       EventRef event, void* pData)
+pascal OSStatus
+wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
+                            EventRef event,
+                            void *userData)

 {
 {

-    wxASSERT(GetEventClass(event) == kEventClassFont && 
-             GetEventKind(event) == kEventFontSelection);
-   
-    OSStatus status = noErr;
-    
-    FMFontFamily fontfamily;
-    FMFontStyle fontstyle;
-    FMFontSize fontsize;
-    RGBColor fontcolor;
-        
-    status = GetEventParameter (event, kEventParamFMFontFamily,
-                                    typeFMFontFamily, NULL,
-                                    sizeof (FMFontFamily), 
-                                    NULL, &(fontfamily)); 
-    check_noerr (status); 
-
-    status = GetEventParameter (event, kEventParamFMFontStyle,
-                                    typeFMFontStyle, NULL,
-                                    sizeof (FMFontStyle), 
-                                    NULL, &(fontstyle)); 
-    check_noerr (status); 
-
-    status = GetEventParameter (event, kEventParamFMFontSize,
-                                    typeFMFontSize, NULL,
-                                    sizeof (FMFontSize), 
-                                    NULL, &(fontsize)); 
-
-    check_noerr (status);
-
-    status = GetEventParameter (event, kEventParamFontColor,
-                                    typeRGBColor, NULL,
-                                    sizeof( RGBColor ), NULL, &fontcolor); 
-    check_noerr (status);
+    OSStatus result = eventNotHandledErr ;
+    wxFontDialog *fontdialog = (wxFontDialog*) userData ;
+    wxFontData& fontdata= fontdialog->GetFontData() ;

     
     

-    //now do the conversion to the wx font data
-    wxFontData theFontData;
-    wxFont        theFont;
- 
-    //set color
-    wxColour theColor;
-    theColor.Set(&(WXCOLORREF&)fontcolor);
-    theFontData.SetColour(theColor);
-        
-    //set size
-    theFont.SetPointSize(fontsize);
-    
-    //set name
-    Str255 theFontName;
-    GetFontName(fontfamily, theFontName);
-    theFont.SetFaceName(wxMacMakeStringFromPascal(theFontName));
-      
-    //TODOTODO: Get font family - mayby by the script code?
-    theFont.SetFamily(wxDEFAULT);  
-
-    //TODOTODO: Get other styles?
-    theFont.SetStyle(((fontstyle & italic) ? wxFONTSTYLE_ITALIC : 0));
-    theFont.SetWeight((fontstyle & bold) ? wxBOLD : wxNORMAL);   
-    theFont.SetUnderlined(((fontstyle & underline) ? true : false));
-        
-    //phew!!  We're done - set the chosen font
-    theFontData.SetChosenFont(theFont);
-    ((wxFontDialog*)pData)->SetData(theFontData);
+    wxMacCarbonEvent cEvent( event );
+    switch(cEvent.GetKind())
+    {
+        case kEventFontSelection :
+        {
+            bool setup = false ;
+#if wxMAC_USE_CORE_TEXT
+            if (  UMAGetSystemVersion() >= 0x1050 )
+            {
+                CTFontDescriptorRef descr;
+                if ( cEvent.GetParameter<CTFontDescriptorRef>( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr )
+                {
+                    wxFont font;
+                    font.MacCreateFromCTFontDescriptor(descr);
+                    fontdata.SetChosenFont( font ) ;
+                    setup = true;
+                }
+            }
+#endif
+#if wxMAC_USE_ATSU_TEXT
+            ATSUFontID fontId = 0 ;
+            if ( !setup && (cEvent.GetParameter<ATSUFontID>(kEventParamATSUFontID, &fontId) == noErr) )
+            {
+                FMFontStyle fontStyle = cEvent.GetParameter<FMFontStyle>(kEventParamFMFontStyle);
+                FMFontSize fontSize = cEvent.GetParameter<FMFontSize>(kEventParamFMFontSize);
+                
+                CFStringRef cfName = NULL;
+#if 1
+                FMFontFamily fontFamily = cEvent.GetParameter<FMFontFamily>(kEventParamFMFontFamily);
+                ATSFontFamilyRef atsfontfamilyref = FMGetATSFontFamilyRefFromFontFamily( fontFamily ) ;
+                OSStatus err = ATSFontFamilyGetName( atsfontfamilyref , kATSOptionFlagsDefault , &cfName ) ;
+                wxASSERT_MSG( err == noErr , wxT("ATSFontFamilyGetName failed") );
+#else
+                // we don't use the ATSU naming anymore
+                ByteCount actualLength = 0;
+                char *c = NULL;
+                OSStatus err = ATSUFindFontName(fontId , kFontFamilyName, kFontUnicodePlatform, kFontNoScriptCode,
+                                                kFontNoLanguageCode , 0 , NULL , &actualLength , NULL );
+                if ( err == noErr)
+                {
+                    actualLength += 1 ;
+                    char *c = (char*)malloc( actualLength );
+                    err = ATSUFindFontName(fontId, kFontFamilyName, kFontUnicodePlatform, kFontNoScriptCode,
+                                           kFontNoLanguageCode, actualLength, c , NULL, NULL);
+                    cfName = CFStringCreateWithCharacters(NULL, (UniChar*) c, (actualLength-1) >> 1);
+                }
+                else
+                {
+                    err = ATSUFindFontName(fontId , kFontFamilyName, kFontNoPlatformCode, kFontNoScriptCode,
+                                           kFontNoLanguageCode , 0 , NULL , &actualLength , NULL );
+                    if ( err == noErr )
+                    {
+                        actualLength += 1 ;
+                        c = (char*)malloc(actualLength);
+                        err = ATSUFindFontName(fontId, kFontFamilyName, kFontNoPlatformCode, kFontNoScriptCode,
+                                               kFontNoLanguageCode, actualLength, c , NULL, NULL);
+                        c[actualLength-1] = 0;
+                        cfName = CFStringCreateWithCString(NULL, c, kCFStringEncodingMacRoman );
+                    }
+                }
+                if ( c!=NULL )
+                    free(c);
+#endif
+                if ( cfName!=NULL )
+                {
+                    fontdata.m_chosenFont.SetFaceName(wxCFStringRef(cfName).AsString(wxLocale::GetSystemEncoding()));
+                    fontdata.m_chosenFont.SetPointSize(fontSize);
+                    fontdata.m_chosenFont.SetStyle(fontStyle & italic ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL);
+                    fontdata.m_chosenFont.SetUnderlined((fontStyle & underline)!=0);
+                    fontdata.m_chosenFont.SetWeight(fontStyle & bold ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL);
+                }
+            }
+#endif // wxMAC_USE_ATSU_TEXT
+            
+            // retrieving the color
+            RGBColor fontColor ;
+            if ( cEvent.GetParameter<RGBColor>(kEventParamFontColor, &fontColor) == noErr )
+            {
+                fontdata.m_fontColour = fontColor;
+            }
+            else
+            {
+                CFDictionaryRef dict ;
+                if ( cEvent.GetParameter<CFDictionaryRef>(kEventParamDictionary, &dict) == noErr )
+                {
+                    CFDictionaryRef attributesDict ;
+                    if ( CFDictionaryGetValueIfPresent(dict, kFontPanelAttributesKey, (const void **)&attributesDict) )
+                    {
+                        CFDataRef tagsData;
+                        CFDataRef sizesData;
+                        CFDataRef valuesData;
+                        if ( CFDictionaryGetValueIfPresent(attributesDict, kFontPanelAttributeTagsKey, (const void **)&tagsData) &&
+                            CFDictionaryGetValueIfPresent(attributesDict, kFontPanelAttributeSizesKey, (const void **)&sizesData) &&
+                            CFDictionaryGetValueIfPresent(attributesDict, kFontPanelAttributeValuesKey, (const void **)&valuesData) )
+                        {
+                            ItemCount count = CFDataGetLength(tagsData)/sizeof(ATSUAttributeTag);
+                            ATSUAttributeTag *tagPtr = (ATSUAttributeTag *)CFDataGetBytePtr(tagsData);
+                            ByteCount *sizePtr = (ByteCount *)CFDataGetBytePtr(sizesData);
+                            UInt32 *bytePtr = (UInt32*)CFDataGetBytePtr(valuesData);
+                            ATSUAttributeValuePtr valuesPtr = bytePtr ;
+                            for ( ItemCount i = 0 ; i < count ; ++i)
+                            {
+                                if ( tagPtr[i] == kATSUColorTag && sizePtr[i] == sizeof(RGBColor))
+                                {
+                                    fontdata.m_fontColour = *(RGBColor *)valuesPtr;
+                                    break ;
+                                }
+                                bytePtr = (UInt32*)( (UInt8*)bytePtr + sizePtr[i]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+            break ;
+    } ;

     
     

-    return status;
+    return result ;

 }
 
 }
 

-DEFINE_ONE_SHOT_HANDLER_GETTER( wxFontDialogEventHandler );
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacCarbonFontPanelHandler )

 
 

-//---------------------------
-//     Class implementation
-//---------------------------
-
-wxFontDialog::wxFontDialog() :
-    m_dialogParent(NULL), m_pEventHandlerRef(NULL)
+wxFontDialog::wxFontDialog()

 {
 }
 
 {
 }
 


@@ -115,141 +200,568 @@ wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 
 wxFontDialog::~wxFontDialog()
 {
 
 wxFontDialog::~wxFontDialog()
 {

-    if (m_pEventHandlerRef)
-        ::RemoveEventHandler((EventHandlerRef&)m_pEventHandlerRef);

 }
 
 }
 

-void wxFontDialog::SetData(wxFontData& fontdata)
+bool wxFontDialog::Create(wxWindow *WXUNUSED(parent), const wxFontData& data)

 {
 {

-    m_fontData = fontdata;
+    m_fontData = data;
+    return true ;

 }
 
 }
 

-bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
+int wxFontDialog::ShowModal()

 {
 {

-    m_dialogParent = parent;
-    m_fontData = data;
+    OSStatus err ;
+    wxFont font = *wxNORMAL_FONT ;
+    if ( m_fontData.m_initialFont.Ok() )
+    {
+        font = m_fontData.m_initialFont ;
+    }
+
+    bool setup = false;
+#if wxMAC_USE_CORE_TEXT
+    if ( UMAGetSystemVersion() >= 0x1050 )
+    {
+        CTFontDescriptorRef descr = (CTFontDescriptorRef)font.MacGetCTFontDescriptor();
+        err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);
+        setup = true;
+    }
+#endif
+#if wxMAC_USE_ATSU_TEXT
+    if ( !setup )
+    {
+        ATSUStyle style = (ATSUStyle)font.MacGetATSUStyle();
+        err = SetFontInfoForSelection (kFontSelectionATSUIType,1, &style , NULL);
+        setup = true;
+    }
+#endif
+    // just clicking on ENTER will not send us any font setting event, therefore we have to make sure
+    // that field is already correct
+    m_fontData.m_chosenFont = font ;
+
+    EventHandlerRef handler ;

 
 

-    //Register the events that will return this dialog
-       EventTypeSpec ftEventList[] = { { kEventClassFont, kEventFontSelection } };
-
-    OSStatus err = noErr;
-  
-//FIXMEFIXME: Why doesn't it recieve events if there's a parent?
-//    if (parent)
-//    {
-//       err = InstallWindowEventHandler(
-//            MAC_WXHWND(parent->GetHandle()),
-//            GetwxFontDialogEventHandlerUPP(),
-//            GetEventTypeCount(ftEventList), ftEventList, 
-//                     this, (&(EventHandlerRef&)m_pEventHandlerRef));
-//            
-//    }
-//    else //no parent - send to app
-//    {
-        err = InstallApplicationEventHandler(
-            GetwxFontDialogEventHandlerUPP(),
-            GetEventTypeCount(ftEventList), ftEventList, 
-                       this, (&(EventHandlerRef&)m_pEventHandlerRef));
-//       }
-               
-    return err == noErr;
+    err = InstallApplicationEventHandler( GetwxMacCarbonFontPanelHandlerUPP(), GetEventTypeCount(eventList), eventList, this , &handler );
+
+    if ( !FPIsFontPanelVisible() )
+        FPShowHideFontPanel();
+
+    int retval = RunMixedFontDialog(this);
+
+    ::RemoveEventHandler(handler);
+
+    return retval ;

 }
 
 }
 

-bool wxFontDialog::IsShown() const
+#else
+
+#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
+
+#undef wxFontDialog
+
+#include "wx/mac/fontdlg.h"
+
+#include "wx/fontenum.h"
+#include "wx/colordlg.h"
+#include "wx/spinctrl.h"
+
+// ---------------------------------------------------------------------------
+// wxFontDialog stub for mac OS's without a native font dialog
+// ---------------------------------------------------------------------------
+
+static const wxChar *FontFamilyIntToString(int family);
+static int FontFamilyStringToInt(const wxChar *family);
+
+
+//-----------------------------------------------------------------------------
+// helper class - wxFontPreviewCtrl
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFontPreviewCtrl : public wxWindow

 {
 {

-    return FPIsFontPanelVisible();
+public:
+    wxFontPreviewCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = 0) :
+        wxWindow(parent, id, pos, sz, style)
+    {
+        SetBackgroundColour(*wxWHITE);
+    }
+
+private:
+    void OnPaint(wxPaintEvent& event);
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxFontPreviewCtrl, wxWindow)
+    EVT_PAINT(wxFontPreviewCtrl::OnPaint)
+END_EVENT_TABLE()
+
+void wxFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxPaintDC dc(this);
+
+    wxSize size = GetSize();
+    wxFont font = GetFont();
+
+    if ( font.Ok() )
+    {
+        dc.SetFont(font);
+        // Calculate vertical centre
+        long w = 0, h = 0;
+        dc.GetTextExtent( wxT("X"), &w, &h);
+        dc.SetTextForeground(GetForegroundColour());
+        dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
+        dc.DrawText(_("ABCDEFGabcdefg12345"),
+                     10, size.y/2 - h/2);
+        dc.DestroyClippingRegion();
+    }

 }
 
 }
 

-int wxFontDialog::ShowModal()
+/*
+ * A control for displaying a small preview of a colour or bitmap
+ */
+
+class wxFontColourSwatchCtrl: public wxControl

 {
 {

-    wxASSERT(!FPIsFontPanelVisible());
-    
-    //set up initial font
-    wxFont theInitialFont = m_fontData.GetInitialFont();
-
-    //create ATSU style
-    ATSUStyle theStyle;
-    OSStatus status = ATSUCreateStyle(&theStyle);
-    check_noerr(status);
-
-    //put stuff into the style - we don't need kATSUColorTag    
-    ATSUFontID                                 fontid = theInitialFont.MacGetATSUFontID();
-    Fixed                                      fontsize = theInitialFont.MacGetFontSize() << 16;
-    ATSUAttributeTag           theTags[2] = { kATSUFontTag, kATSUSizeTag };
-    ByteCount                  theSizes[2] = { sizeof(ATSUFontID), sizeof(Fixed) };
-    ATSUAttributeValuePtr   theValues[2] = { &fontid, 
-                                             &fontsize };
-    
-    //set the stuff for the ATSU style
-    verify_noerr (ATSUSetAttributes (theStyle, 2, theTags, theSizes, theValues) ); 
-    
-    //they set us up the bomb!  Set the initial font of the dialog
-    SetFontInfoForSelection(kFontSelectionATSUIType,
-                            1, 
-                            &theStyle,
-                            (HIObjectRef) 
-                                (m_dialogParent ? 
-                                 GetWindowEventTarget(MAC_WXHWND(m_dialogParent->GetHandle())) :
-                                 GetApplicationEventTarget())
-                            );
-    
-    //dispose of the style
-    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)
+    DECLARE_CLASS(wxFontColourSwatchCtrl)
+public:
+    wxFontColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
+    virtual ~wxFontColourSwatchCtrl();
+
+    void OnPaint(wxPaintEvent& event);
+    void OnMouseEvent(wxMouseEvent& event);
+
+    void SetColour(const wxColour& colour) { m_colour = colour; SetBackgroundColour(m_colour); }
+
+    wxColour& GetColour() { return m_colour; }
+
+    virtual wxSize DoGetBestSize() const { return GetSize(); }
+
+protected:
+    wxColour    m_colour;
+
+DECLARE_EVENT_TABLE()
+};
+
+/*
+ * A control for displaying a small preview of a colour or bitmap
+ */
+
+BEGIN_EVENT_TABLE(wxFontColourSwatchCtrl, wxControl)
+    EVT_MOUSE_EVENTS(wxFontColourSwatchCtrl::OnMouseEvent)
+END_EVENT_TABLE()
+
+IMPLEMENT_CLASS(wxFontColourSwatchCtrl, wxControl)
+
+wxFontColourSwatchCtrl::wxFontColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
+    wxControl(parent, id, pos, size, style)
+{
+    SetColour(* wxWHITE);
+    SetBackgroundStyle(wxBG_STYLE_COLOUR);
+}
+
+wxFontColourSwatchCtrl::~wxFontColourSwatchCtrl()
+{
+}
+
+void wxFontColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
+{
+    if (event.LeftDown())

     {
     {

-        while(FPIsFontPanelVisible()) 
+        wxWindow* parent = GetParent();
+        while (parent != NULL && !parent->IsKindOf(CLASSINFO(wxDialog)) && !parent->IsKindOf(CLASSINFO(wxFrame)))
+            parent = parent->GetParent();
+
+        wxColourData data;
+        data.SetChooseFull(true);
+        data.SetColour(m_colour);
+        wxColourDialog *dialog = new wxColourDialog(parent, &data);
+        // Crashes on wxMac (no m_peer)
+#ifndef __WXMAC__
+        dialog->SetTitle(_("Background colour"));
+#endif
+        if (dialog->ShowModal() == wxID_OK)

         {
         {

-            //yeild so we can get events
-            ::wxSafeYield(m_dialogParent, false);
+            wxColourData retData = dialog->GetColourData();
+            m_colour = retData.GetColour();
+            SetBackgroundColour(m_colour);

         }
         }

+        dialog->Destroy();
+        Refresh();
+
+        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+        HandleWindowEvent(event);

     }
     }

-    else
-        return wxID_CANCEL;
-    
-    return wxID_OK;

 }
 
 }
 

+/*!
+ * wxFontDialog type definition
+ */

 
 

-#else
-   //10.2+ only
-   
-   
-//
-//     no native implementation
-//
+IMPLEMENT_DYNAMIC_CLASS( wxFontDialog, wxDialog )

 
 

-wxFontDialog::wxFontDialog()
+/*!
+ * wxFontDialog event table definition
+ */
+
+BEGIN_EVENT_TABLE( wxFontDialog, wxDialog )
+    EVT_LISTBOX( wxID_FONTDIALOG_FACENAME, wxFontDialog::OnFontdialogFacenameSelected )
+    EVT_SPINCTRL( wxID_FONTDIALOG_FONTSIZE, wxFontDialog::OnFontdialogFontsizeUpdated )
+    EVT_TEXT( wxID_FONTDIALOG_FONTSIZE, wxFontDialog::OnFontdialogFontsizeTextUpdated )
+    EVT_CHECKBOX( wxID_FONTDIALOG_BOLD, wxFontDialog::OnFontdialogBoldClick )
+    EVT_CHECKBOX( wxID_FONTDIALOG_ITALIC, wxFontDialog::OnFontdialogItalicClick )
+    EVT_CHECKBOX( wxID_FONTDIALOG_UNDERLINED, wxFontDialog::OnFontdialogUnderlinedClick )
+    EVT_BUTTON( wxID_OK, wxFontDialog::OnOkClick )
+    EVT_BUTTON(wxID_FONTDIALOG_COLOUR, wxFontDialog::OnColourChanged)
+END_EVENT_TABLE()
+
+/*!
+ * wxFontDialog constructors
+ */
+
+wxFontDialog::wxFontDialog( )

 {
     m_dialogParent = NULL;
 }
 
 {
     m_dialogParent = NULL;
 }
 

-wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
+wxFontDialog::wxFontDialog(wxWindow* parent, const wxFontData& fontData)

 {
 {

-    Create(parent, data);
+    m_dialogParent = NULL;
+
+    Create(parent, fontData);

 }
 
 }
 

-void wxFontDialog::SetData(wxFontData& fontdata)
+wxFontDialog::~wxFontDialog()

 {
 {

-    m_fontData = fontdata;
+    // empty

 }
 
 }
 

-bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
+/*!
+ * wxFontDialog creator
+ */
+
+bool wxFontDialog::Create(wxWindow* parent, const wxFontData& fontData)

 {
 {

-    m_dialogParent = parent;
+    m_fontData = fontData;
+    m_suppressUpdates = false;

 
 

-    m_fontData = data;
+    wxString caption = _("Font");
+
+    m_facenameCtrl = NULL;
+    m_sizeCtrl = NULL;
+    m_boldCtrl = NULL;
+    m_italicCtrl = NULL;
+    m_underlinedCtrl = NULL;
+    m_colourCtrl = NULL;
+    m_previewCtrl = NULL;
+
+    InitializeFont();
+
+    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
+    wxDialog::Create( parent, wxID_ANY, caption, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+
+    CreateControls();
+    GetSizer()->Fit(this);
+    GetSizer()->SetSizeHints(this);
+    Centre();
+
+    return true;
+}
+
+/*!
+ * Control creation for wxFontDialog
+ */
+
+void wxFontDialog::CreateControls()
+{
+    wxFontDialog* itemDialog1 = this;
+
+    wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+    itemDialog1->SetSizer(itemBoxSizer2);
+
+    wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5);
+
+    wxFlexGridSizer* itemFlexGridSizer4 = new wxFlexGridSizer(6, 2, 10, 0);
+    itemFlexGridSizer4->AddGrowableRow(4);
+    itemFlexGridSizer4->AddGrowableCol(1);
+    itemBoxSizer3->Add(itemFlexGridSizer4, 1, wxGROW|wxALL, 5);
+
+    wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Font:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL);
+    itemFlexGridSizer4->Add(itemBoxSizer6, 0, wxGROW|wxGROW, 5);
+
+    wxString* m_facenameCtrlStrings = NULL;
+    m_facenameCtrl = new wxListBox( itemDialog1, wxID_FONTDIALOG_FACENAME, wxDefaultPosition, wxSize(320, 100), 0, m_facenameCtrlStrings, wxLB_SINGLE );
+    itemBoxSizer6->Add(m_facenameCtrl, 0, wxGROW|wxALL, 5);
+
+    wxStaticText* itemStaticText8 = new wxStaticText( itemDialog1, wxID_STATIC, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer4->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    m_sizeCtrl = new wxSpinCtrl( itemDialog1, wxID_FONTDIALOG_FONTSIZE, _T("12"), wxDefaultPosition, wxSize(60, -1), wxSP_ARROW_KEYS, 1, 300, 12 );
+    m_sizeCtrl->SetHelpText(_("The font size in points."));
+    if (ShowToolTips())
+        m_sizeCtrl->SetToolTip(_("The font size in points."));
+    itemFlexGridSizer4->Add(m_sizeCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer4->Add(itemStaticText10, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer4->Add(itemBoxSizer11, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+
+    m_boldCtrl = new wxCheckBox( itemDialog1, wxID_FONTDIALOG_BOLD, _("Bold"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
+    m_boldCtrl->SetValue(false);
+    m_boldCtrl->SetHelpText(_("Check to make the font bold."));
+    if (ShowToolTips())
+        m_boldCtrl->SetToolTip(_("Check to make the font bold."));
+    itemBoxSizer11->Add(m_boldCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    m_italicCtrl = new wxCheckBox( itemDialog1, wxID_FONTDIALOG_ITALIC, _("Italic"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
+    m_italicCtrl->SetValue(false);
+    m_italicCtrl->SetHelpText(_("Check to make the font italic."));
+    if (ShowToolTips())
+        m_italicCtrl->SetToolTip(_("Check to make the font italic."));
+    itemBoxSizer11->Add(m_italicCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    if (m_fontData.GetEnableEffects())
+    {
+        m_underlinedCtrl = new wxCheckBox( itemDialog1, wxID_FONTDIALOG_UNDERLINED, _("Underlined"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
+        m_underlinedCtrl->SetValue(false);
+        m_underlinedCtrl->SetHelpText(_("Check to make the font underlined."));
+        if (ShowToolTips())
+            m_underlinedCtrl->SetToolTip(_("Check to make the font underlined."));
+        itemBoxSizer11->Add(m_underlinedCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    }
+
+    if (m_fontData.GetEnableEffects())
+    {
+        wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("Colour:"), wxDefaultPosition, wxDefaultSize, 0 );
+        itemFlexGridSizer4->Add(itemStaticText15, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5);
+
+        m_colourCtrl = new wxFontColourSwatchCtrl( itemDialog1, wxID_FONTDIALOG_COLOUR, wxDefaultPosition, wxSize(-1, 30), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+        m_colourCtrl->SetHelpText(_("Click to change the font colour."));
+        if (ShowToolTips())
+            m_colourCtrl->SetToolTip(_("Click to change the font colour."));
+        itemFlexGridSizer4->Add(m_colourCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    }
+
+    wxStaticText* itemStaticText17 = new wxStaticText( itemDialog1, wxID_STATIC, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer4->Add(itemStaticText17, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5);
+
+    m_previewCtrl = new wxFontPreviewCtrl( itemDialog1, wxID_FONTDIALOG_PREVIEW, wxDefaultPosition, wxSize(-1, 70), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+    m_previewCtrl->SetHelpText(_("Shows a preview of the font."));
+    if (ShowToolTips())
+        m_previewCtrl->SetToolTip(_("Shows a preview of the font."));
+    itemFlexGridSizer4->Add(m_previewCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer3->Add(itemBoxSizer19, 0, wxALIGN_RIGHT|wxALL, 5);
+
+    wxButton* itemButton20 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton20->SetHelpText(_("Click to cancel changes to the font."));
+    if (ShowToolTips())
+        itemButton20->SetToolTip(_("Click to cancel changes to the font."));
+    itemBoxSizer19->Add(itemButton20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxButton* itemButton21 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton21->SetDefault();
+    itemButton21->SetHelpText(_("Click to confirm changes to the font."));
+    if (ShowToolTips())
+        itemButton21->SetToolTip(_("Click to confirm changes to the font."));
+    itemBoxSizer19->Add(itemButton21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxFontEnumerator enumerator;
+    enumerator.EnumerateFacenames();
+    wxArrayString facenames = enumerator.GetFacenames();
+    if (facenames)
+    {
+        facenames.Add(_("<Any>"));
+        facenames.Add(_("<Any Roman>"));
+        facenames.Add(_("<Any Decorative>"));
+        facenames.Add(_("<Any Modern>"));
+        facenames.Add(_("<Any Script>"));
+        facenames.Add(_("<Any Swiss>"));
+        facenames.Add(_("<Any Teletype>"));
+        facenames.Sort();
+        m_facenameCtrl->Append(facenames);
+    }
+
+    InitializeControls();
+    m_previewCtrl->SetFont(m_dialogFont);
+    if (m_fontData.GetColour().Ok())
+    {
+        m_previewCtrl->SetForegroundColour(m_fontData.GetColour());
+    }
+    m_previewCtrl->Refresh();
+}
+
+/*!
+ * wxEVT_COMMAND_SPINCTRL_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE
+ */
+
+void wxFontDialog::OnFontdialogFontsizeUpdated( wxSpinEvent& WXUNUSED(event) )
+{
+    ChangeFont();
+}
+
+/*!
+ * wxEVT_COMMAND_TEXT_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE
+ */

 
 

-    // TODO: you may need to do dialog creation here, unless it's
-    // done in ShowModal.
-    return TRUE;
+void wxFontDialog::OnFontdialogFontsizeTextUpdated( wxCommandEvent& WXUNUSED(event) )
+{
+    ChangeFont();
+}
+
+/*!
+ * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_BOLD
+ */
+
+void wxFontDialog::OnFontdialogBoldClick( wxCommandEvent& WXUNUSED(event) )
+{
+    ChangeFont();
+}
+
+/*!
+ * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_ITALIC
+ */
+
+void wxFontDialog::OnFontdialogItalicClick( wxCommandEvent& WXUNUSED(event) )
+{
+    ChangeFont();
+}
+
+/*!
+ * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_UNDERLINED
+ */
+
+void wxFontDialog::OnFontdialogUnderlinedClick( wxCommandEvent& WXUNUSED(event) )
+{
+    ChangeFont();
+}
+
+/*!
+ * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
+ */
+
+void wxFontDialog::OnOkClick( wxCommandEvent& event )
+{
+    event.Skip();
+}
+
+
+/*!
+ * wxEVT_COMMAND_LISTBOX_SELECTED event handler for wxID_FONTDIALOG_FACENAME
+ */
+
+void wxFontDialog::OnFontdialogFacenameSelected( wxCommandEvent& WXUNUSED(event) )
+{
+    ChangeFont();
+}
+
+void wxFontDialog::OnColourChanged(wxCommandEvent & WXUNUSED(event))
+{
+    m_fontData.SetColour(m_colourCtrl->GetColour());
+    m_previewCtrl->SetForegroundColour(m_colourCtrl->GetColour());
+    m_previewCtrl->Refresh();
+}
+
+/*!
+ * Should we show tooltips?
+ */
+
+bool wxFontDialog::ShowToolTips()
+{
+    return true;
+}
+
+void wxFontDialog::InitializeFont()
+{
+    int fontFamily = wxSWISS;
+    int fontWeight = wxNORMAL;
+    int fontStyle = wxNORMAL;
+    int fontSize = 12;
+    bool fontUnderline = false;
+    wxString fontName;
+
+    if (m_fontData.m_initialFont.Ok())
+    {
+        fontFamily = m_fontData.m_initialFont.GetFamily();
+        fontWeight = m_fontData.m_initialFont.GetWeight();
+        fontStyle = m_fontData.m_initialFont.GetStyle();
+        fontSize = m_fontData.m_initialFont.GetPointSize();
+        fontUnderline = m_fontData.m_initialFont.GetUnderlined();
+        fontName = m_fontData.m_initialFont.GetFaceName();
+    }
+
+    m_dialogFont = wxFont(fontSize, fontFamily, fontStyle,
+                          fontWeight, fontUnderline, fontName);
+
+    if (m_previewCtrl)
+        m_previewCtrl->SetFont(m_dialogFont);
+
+    m_fontData.SetChosenFont(m_dialogFont);
+}
+
+/// Set controls according to current font
+void wxFontDialog::InitializeControls()
+{
+    m_suppressUpdates = true;
+
+    if (m_underlinedCtrl)
+        m_underlinedCtrl->SetValue(m_dialogFont.GetUnderlined());
+
+    m_boldCtrl->SetValue(m_dialogFont.GetWeight() == wxBOLD);
+    m_italicCtrl->SetValue(m_dialogFont.GetStyle() == wxITALIC);
+    m_sizeCtrl->SetValue(m_dialogFont.GetPointSize());
+
+    wxString facename = m_dialogFont.GetFaceName();
+    if (facename.empty() || m_facenameCtrl->FindString(facename) == wxNOT_FOUND)
+    {
+        facename = FontFamilyIntToString(m_dialogFont.GetFamily());
+    }
+    m_facenameCtrl->SetStringSelection(facename);
+
+    if (m_colourCtrl && m_fontData.GetColour().Ok())
+    {
+        m_colourCtrl->SetColour(m_fontData.GetColour());
+        m_colourCtrl->Refresh();
+    }
+
+    m_suppressUpdates = false;
+}
+
+/// Respond to font change
+void wxFontDialog::ChangeFont()
+{
+    if (m_suppressUpdates)
+        return;
+
+    bool underlined = m_underlinedCtrl ? m_underlinedCtrl->GetValue() : false;
+    bool italic = m_italicCtrl->GetValue();
+    bool bold = m_boldCtrl->GetValue();
+    int size = m_sizeCtrl->GetValue();
+    wxString facename = m_facenameCtrl->GetStringSelection();
+
+    int family = FontFamilyStringToInt(facename);
+    if (family == -1)
+        family = wxDEFAULT;
+    else
+        facename = wxEmptyString;
+
+    m_dialogFont = wxFont(size, family, italic ? wxITALIC : wxNORMAL, bold ? wxBOLD : wxNORMAL,
+        underlined, facename);
+
+    m_fontData.SetChosenFont(m_dialogFont);
+
+    m_previewCtrl->SetFont(m_dialogFont);
+    m_previewCtrl->Refresh();
+}
+
+void wxFontDialog::SetData(const wxFontData& fontdata)
+{
+    m_fontData = fontdata;

 }
 
 bool wxFontDialog::IsShown() const
 }
 
 bool wxFontDialog::IsShown() const


@@ -259,8 +771,55 @@ bool wxFontDialog::IsShown() const
 
 int wxFontDialog::ShowModal()
 {
 
 int wxFontDialog::ShowModal()
 {

-    // TODO: show (maybe create) the dialog
-    return wxID_CANCEL;
+    return wxDialog::ShowModal();

 }
 
 }
 

-#endif // 10.2+
\ No newline at end of file
+void wxFontDialog::OnPanelClose()
+{
+}
+
+const wxChar *FontFamilyIntToString(int family)
+{
+    switch (family)
+    {
+        case wxROMAN:
+            return _("<Any Roman>");
+        case wxDECORATIVE:
+            return _("<Any Decorative>");
+        case wxMODERN:
+            return _("<Any Modern>");
+        case wxSCRIPT:
+            return _("<Any Script>");
+        case wxTELETYPE:
+            return _("<Any Teletype>");
+        case wxSWISS:
+        default:
+            return _("<Any Swiss>");
+    }
+}
+
+int FontFamilyStringToInt(const wxChar *family)
+{
+    if (!family)
+        return wxSWISS;
+
+    if (wxStrcmp(family, _("<Any Roman>")) == 0)
+        return wxROMAN;
+    else if (wxStrcmp(family, _("<Any Decorative>")) == 0)
+        return wxDECORATIVE;
+    else if (wxStrcmp(family, _("<Any Modern>")) == 0)
+        return wxMODERN;
+    else if (wxStrcmp(family, _("<Any Script>")) == 0)
+        return wxSCRIPT;
+    else if (wxStrcmp(family, _("<Any Teletype>")) == 0)
+        return wxTELETYPE;
+    else if (wxStrcmp(family, _("<Any Swiss>")) == 0)
+        return wxSWISS;
+    else return -1;
+}
+
+#endif // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
+
+#endif // wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+
+#endif // wxUSE_FONTDLG