X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1b806b98241ab649c169aaa1f134df85e80fb8b..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/osx/carbon/fontdlgosx.mm?ds=sidebyside diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm index 7c21271320..6c2ab56c81 100644 --- a/src/osx/carbon/fontdlgosx.mm +++ b/src/osx/carbon/fontdlgosx.mm @@ -167,6 +167,7 @@ int RunMixedFontDialog(wxFontDialog* dialog) NSRect rectBox = NSMakeRect( 0 , 0 , 192 , 40 ); accessoryView = [[wxMacFontPanelAccView alloc] initWithFrame:rectBox]; [fontPanel setAccessoryView:accessoryView]; + [accessoryView release]; [fontPanel setDefaultButtonCell:[[accessoryView okButton] cell]] ; } @@ -220,7 +221,6 @@ int RunMixedFontDialog(wxFontDialog* dialog) retval = wxID_OK ; } [fontPanel setAccessoryView:nil]; - [accessoryView release]; return retval ; } @@ -351,6 +351,11 @@ wxFontDialog::wxFontDialog() { } +wxFontDialog::wxFontDialog(wxWindow *parent) +{ + Create(parent); +} + wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); @@ -360,10 +365,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];