X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97ff49b3834325cfe53813aeb53d326d7661f184..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/richtext/richtextfontpage.h?ds=sidebyside diff --git a/include/wx/richtext/richtextfontpage.h b/include/wx/richtext/richtextfontpage.h index ba1c0d7f02..9123be10ea 100644 --- a/include/wx/richtext/richtextfontpage.h +++ b/include/wx/richtext/richtextfontpage.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/richtext/richeditfontpage.h +// Name: wx/richtext/richtextfontpage.h // Purpose: Font page for wxRichTextFormattingDialog // Author: Julian Smart // Modified by: @@ -16,6 +16,8 @@ * Includes */ +#include "wx/richtext/richtextdialogpage.h" + ////@begin includes ////@end includes @@ -34,10 +36,10 @@ class wxRichTextFontPreviewCtrl; */ ////@begin control identifiers -#define SYMBOL_WXRICHTEXTFONTPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL -#define SYMBOL_WXRICHTEXTFONTPAGE_TITLE _("wxRichTextFontPage") +#define SYMBOL_WXRICHTEXTFONTPAGE_STYLE wxTAB_TRAVERSAL +#define SYMBOL_WXRICHTEXTFONTPAGE_TITLE wxEmptyString #define SYMBOL_WXRICHTEXTFONTPAGE_IDNAME ID_RICHTEXTFONTPAGE -#define SYMBOL_WXRICHTEXTFONTPAGE_SIZE wxSize(400, 300) +#define SYMBOL_WXRICHTEXTFONTPAGE_SIZE wxSize(200, 100) #define SYMBOL_WXRICHTEXTFONTPAGE_POSITION wxDefaultPosition ////@end control identifiers @@ -45,21 +47,22 @@ class wxRichTextFontPreviewCtrl; * wxRichTextFontPage class declaration */ -class WXDLLIMPEXP_RICHTEXT wxRichTextFontPage: public wxPanel +class WXDLLIMPEXP_RICHTEXT wxRichTextFontPage: public wxRichTextDialogPage { DECLARE_DYNAMIC_CLASS( wxRichTextFontPage ) DECLARE_EVENT_TABLE() + DECLARE_HELP_PROVISION() public: /// Constructors wxRichTextFontPage( ); - wxRichTextFontPage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTFONTPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTFONTPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTFONTPAGE_SIZE, long style = SYMBOL_WXRICHTEXTFONTPAGE_STYLE ); + wxRichTextFontPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTFONTPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTFONTPAGE_SIZE, long style = SYMBOL_WXRICHTEXTFONTPAGE_STYLE ); /// Initialise members void Init(); /// Creation - bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTFONTPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTFONTPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTFONTPAGE_SIZE, long style = SYMBOL_WXRICHTEXTFONTPAGE_STYLE ); + bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTFONTPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTFONTPAGE_SIZE, long style = SYMBOL_WXRICHTEXTFONTPAGE_STYLE ); /// Creates the controls and sizers void CreateControls(); @@ -75,7 +78,7 @@ public: void OnColourClicked( wxCommandEvent& event ); /// Gets the attributes associated with the main formatting dialog - wxTextAttrEx* GetAttributes(); + wxRichTextAttr* GetAttributes(); ////@begin wxRichTextFontPage event handler declarations @@ -97,6 +100,18 @@ public: /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL void OnUnderliningCtrlSelected( wxCommandEvent& event ); + /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL + void OnStrikethroughctrlClick( wxCommandEvent& event ); + + /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTFONTPAGE_CAPSCTRL + void OnCapsctrlClick( wxCommandEvent& event ); + + /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTFONTPAGE_SUPERSCRIPT + void OnRichtextfontpageSuperscriptClick( wxCommandEvent& event ); + + /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTFONTPAGE_SUBSCRIPT + void OnRichtextfontpageSubscriptClick( wxCommandEvent& event ); + ////@end wxRichTextFontPage event handler declarations ////@begin wxRichTextFontPage member function declarations @@ -120,6 +135,11 @@ public: wxComboBox* m_weightCtrl; wxComboBox* m_underliningCtrl; wxRichTextColourSwatchCtrl* m_colourCtrl; + wxRichTextColourSwatchCtrl* m_bgColourCtrl; + wxCheckBox* m_strikethroughCtrl; + wxCheckBox* m_capitalsCtrl; + wxCheckBox* m_superscriptCtrl; + wxCheckBox* m_subscriptCtrl; wxRichTextFontPreviewCtrl* m_previewCtrl; /// Control identifiers enum { @@ -132,12 +152,18 @@ public: ID_RICHTEXTFONTPAGE_WEIGHTCTRL = 10004, ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL = 10008, ID_RICHTEXTFONTPAGE_COLOURCTRL = 10009, + ID_RICHTEXTFONTPAGE_BGCOLOURCTRL = 10014, + ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL = 10010, + ID_RICHTEXTFONTPAGE_CAPSCTRL = 10011, + ID_RICHTEXTFONTPAGE_SUPERSCRIPT = 10012, + ID_RICHTEXTFONTPAGE_SUBSCRIPT = 10013, ID_RICHTEXTFONTPAGE_PREVIEWCTRL = 10003 }; ////@end wxRichTextFontPage member variables bool m_dontUpdate; bool m_colourPresent; + bool m_bgColourPresent; }; #endif