X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/osx/fontdlg.h diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h index ca96ff10c9..78df5dba9b 100644 --- a/include/wx/osx/fontdlg.h +++ b/include/wx/osx/fontdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/fontdlg.h +// Name: wx/osx/fontdlg.h // Purpose: wxFontDialog class using fonts window services (10.2+). // Author: Ryan Norton // Modified by: @@ -13,7 +13,6 @@ #define _WX_FONTDLG_H_ #include "wx/dialog.h" -#include "wx/cmndata.h" /* * Font dialog @@ -36,9 +35,11 @@ class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog { public: wxFontDialog(); + wxFontDialog(wxWindow *parent); wxFontDialog(wxWindow *parent, const wxFontData& data); virtual ~wxFontDialog(); + bool Create(wxWindow *parent); bool Create(wxWindow *parent, const wxFontData& data); int ShowModal(); @@ -123,25 +124,25 @@ public: /// Respond to colour change void OnColourChanged(wxCommandEvent& event); - /// wxEVT_COMMAND_LISTBOX_SELECTED event handler for wxID_FONTDIALOG_FACENAME + /// wxEVT_LISTBOX event handler for wxID_FONTDIALOG_FACENAME void OnFontdialogFacenameSelected( wxCommandEvent& event ); - /// wxEVT_COMMAND_SPINCTRL_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE + /// wxEVT_SPINCTRL event handler for wxID_FONTDIALOG_FONTSIZE void OnFontdialogFontsizeUpdated( wxSpinEvent& event ); - /// wxEVT_COMMAND_TEXT_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE + /// wxEVT_TEXT event handler for wxID_FONTDIALOG_FONTSIZE void OnFontdialogFontsizeTextUpdated( wxCommandEvent& event ); - /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_BOLD + /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_BOLD void OnFontdialogBoldClick( wxCommandEvent& event ); - /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_ITALIC + /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_ITALIC void OnFontdialogItalicClick( wxCommandEvent& event ); - /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_UNDERLINED + /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_UNDERLINED void OnFontdialogUnderlinedClick( wxCommandEvent& event ); - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK + /// wxEVT_BUTTON event handler for wxID_OK void OnOkClick( wxCommandEvent& event ); /// Should we show tooltips?