X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a62b2c6eddef047009cf2c14365b7012fc418ec..ec2df34e27ba41f202ecbf096cdfed082a9ddb8f:/src/osx/carbon/fontdlgosx.mm diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm index 2d42537db7..0ac8bd7d55 100644 --- a/src/osx/carbon/fontdlgosx.mm +++ b/src/osx/carbon/fontdlgosx.mm @@ -28,6 +28,7 @@ #endif #include "wx/fontutil.h" +#include "wx/modalhook.h" // ============================================================================ // implementation @@ -351,6 +352,11 @@ wxFontDialog::wxFontDialog() { } +wxFontDialog::wxFontDialog(wxWindow *parent) +{ + Create(parent); +} + wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); @@ -360,10 +366,20 @@ wxFontDialog::~wxFontDialog() { } +bool wxFontDialog::Create(wxWindow *parent) +{ + return Create(parent); +} + bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) { m_fontData = data; + return Create(parent); +} + +bool wxFontDialog::Create(wxWindow *parent) +{ //autorelease pool - req'd for carbon NSAutoreleasePool *thePool; thePool = [[NSAutoreleasePool alloc] init]; @@ -419,6 +435,8 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) int wxFontDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + //Start the pool. Required for carbon interaction //(For those curious, the only thing that happens //if you don't do this is a bunch of error