X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..683df83d51c0f080e2e5210dc8115be0cb30d1ad:/src/osx/carbon/fontdlg.cpp?ds=inline diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp index 80c103c46f..b1ae442c78 100644 --- a/src/osx/carbon/fontdlg.cpp +++ b/src/osx/carbon/fontdlg.cpp @@ -42,6 +42,7 @@ #include "wx/fontdlg.h" #include "wx/fontutil.h" +#include "wx/modalhook.h" #if wxOSX_USE_EXPERIMENTAL_FONTDIALOG @@ -77,7 +78,7 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler), { bool setup = false ; #if wxOSX_USE_CORE_TEXT - if ( UMAGetSystemVersion() >= 0x1050 ) + if ( !setup ) { CTFontDescriptorRef descr; if ( cEvent.GetParameter( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr ) @@ -202,6 +203,11 @@ wxFontDialog::wxFontDialog() { } +wxFontDialog::wxFontDialog(wxWindow *parent) +{ + Create(parent); +} + wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); @@ -211,14 +217,21 @@ wxFontDialog::~wxFontDialog() { } -bool wxFontDialog::Create(wxWindow *WXUNUSED(parent), const wxFontData& data) +bool wxFontDialog::Create(wxWindow *WXUNUSED(parent)) { - m_fontData = data; return true ; } +bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) +{ + m_fontData = data; + return Create(parent) ; +} + int wxFontDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + #if wxOSX_USE_CARBON OSStatus err ; @@ -230,7 +243,7 @@ int wxFontDialog::ShowModal() bool setup = false; #if wxOSX_USE_CORE_TEXT - if ( UMAGetSystemVersion() >= 0x1050 ) + if ( !setup ) { CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.OSXGetCTFont() ); err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL); @@ -402,7 +415,7 @@ void wxFontColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event) dialog->Destroy(); Refresh(); - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId()); + wxCommandEvent event(wxEVT_BUTTON, GetId()); HandleWindowEvent(event); } } @@ -504,7 +517,7 @@ void wxFontDialog::CreateControls() itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5); wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL); - itemFlexGridSizer4->Add(itemBoxSizer6, 0, wxGROW|wxGROW, 5); + itemFlexGridSizer4->Add(itemBoxSizer6, 0, wxGROW, 5); wxString* m_facenameCtrlStrings = NULL; m_facenameCtrl = new wxListBox( itemDialog1, wxID_FONTDIALOG_FACENAME, wxDefaultPosition, wxSize(320, 100), 0, m_facenameCtrlStrings, wxLB_SINGLE ); @@ -612,7 +625,7 @@ void wxFontDialog::CreateControls() } /*! - * wxEVT_COMMAND_SPINCTRL_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE + * wxEVT_SPINCTRL event handler for wxID_FONTDIALOG_FONTSIZE */ void wxFontDialog::OnFontdialogFontsizeUpdated( wxSpinEvent& WXUNUSED(event) ) @@ -621,7 +634,7 @@ void wxFontDialog::OnFontdialogFontsizeUpdated( wxSpinEvent& WXUNUSED(event) ) } /*! - * wxEVT_COMMAND_TEXT_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE + * wxEVT_TEXT event handler for wxID_FONTDIALOG_FONTSIZE */ void wxFontDialog::OnFontdialogFontsizeTextUpdated( wxCommandEvent& WXUNUSED(event) ) @@ -630,7 +643,7 @@ void wxFontDialog::OnFontdialogFontsizeTextUpdated( wxCommandEvent& WXUNUSED(eve } /*! - * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_BOLD + * wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_BOLD */ void wxFontDialog::OnFontdialogBoldClick( wxCommandEvent& WXUNUSED(event) ) @@ -639,7 +652,7 @@ void wxFontDialog::OnFontdialogBoldClick( wxCommandEvent& WXUNUSED(event) ) } /*! - * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_ITALIC + * wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_ITALIC */ void wxFontDialog::OnFontdialogItalicClick( wxCommandEvent& WXUNUSED(event) ) @@ -648,7 +661,7 @@ void wxFontDialog::OnFontdialogItalicClick( wxCommandEvent& WXUNUSED(event) ) } /*! - * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_UNDERLINED + * wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_UNDERLINED */ void wxFontDialog::OnFontdialogUnderlinedClick( wxCommandEvent& WXUNUSED(event) ) @@ -657,7 +670,7 @@ void wxFontDialog::OnFontdialogUnderlinedClick( wxCommandEvent& WXUNUSED(event) } /*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK + * wxEVT_BUTTON event handler for wxID_OK */ void wxFontDialog::OnOkClick( wxCommandEvent& event ) @@ -667,7 +680,7 @@ void wxFontDialog::OnOkClick( wxCommandEvent& event ) /*! - * wxEVT_COMMAND_LISTBOX_SELECTED event handler for wxID_FONTDIALOG_FACENAME + * wxEVT_LISTBOX event handler for wxID_FONTDIALOG_FACENAME */ void wxFontDialog::OnFontdialogFacenameSelected( wxCommandEvent& WXUNUSED(event) )