No real changes, just add wxSizerItem::AddBorderToSize() helper.

[wxWidgets.git] / include / wx / richtext / richtextfontpage.h

diff --git a/include/wx/richtext/richtextfontpage.h b/include/wx/richtext/richtextfontpage.h
index ba1c0d7f022dcf449fde84749a40942f1bda0418..7573391cce9cdf862df267ba2cff4844ecb56679 100644 (file)
--- 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:
 // Purpose:     Font page for wxRichTextFormattingDialog
 // Author:      Julian Smart
 // Modified by:


@@ -16,7 +16,10 @@
  * Includes
  */
 
  * Includes
  */
 

+#include "wx/richtext/richtextdialogpage.h"
+

 ////@begin includes
 ////@begin includes

+#include "wx/spinbutt.h"

 ////@end includes
 
 /*!
 ////@end includes
 
 /*!


@@ -24,6 +27,8 @@
  */
 
 ////@begin forward declarations
  */
 
 ////@begin forward declarations

+class wxSpinButton;
+class wxBoxSizer;

 class wxRichTextFontListBox;
 class wxRichTextColourSwatchCtrl;
 class wxRichTextFontPreviewCtrl;
 class wxRichTextFontListBox;
 class wxRichTextColourSwatchCtrl;
 class wxRichTextFontPreviewCtrl;


@@ -34,10 +39,10 @@ class wxRichTextFontPreviewCtrl;
  */
 
 ////@begin control identifiers
  */
 
 ////@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_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
 
 #define SYMBOL_WXRICHTEXTFONTPAGE_POSITION wxDefaultPosition
 ////@end control identifiers
 


@@ -45,21 +50,22 @@ class wxRichTextFontPreviewCtrl;
  * wxRichTextFontPage class declaration
  */
 
  * wxRichTextFontPage class declaration
  */
 

-class WXDLLIMPEXP_RICHTEXT wxRichTextFontPage: public wxPanel
+class WXDLLIMPEXP_RICHTEXT wxRichTextFontPage: public wxRichTextDialogPage

 {
     DECLARE_DYNAMIC_CLASS( wxRichTextFontPage )
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS( wxRichTextFontPage )
     DECLARE_EVENT_TABLE()

+    DECLARE_HELP_PROVISION()

 
 public:
     /// Constructors
     wxRichTextFontPage( );
 
 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
 
     /// 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();
 
     /// Creates the controls and sizers
     void CreateControls();


@@ -75,16 +81,28 @@ public:
     void OnColourClicked( wxCommandEvent& event );
 
     /// Gets the attributes associated with the main formatting dialog
     void OnColourClicked( wxCommandEvent& event );
 
     /// Gets the attributes associated with the main formatting dialog

-    wxTextAttrEx* GetAttributes();
+    wxRichTextAttr* GetAttributes();

 
 ////@begin wxRichTextFontPage event handler declarations
 
 
 ////@begin wxRichTextFontPage event handler declarations
 

+    /// wxEVT_IDLE event handler for ID_RICHTEXTFONTPAGE
+    void OnIdle( wxIdleEvent& event );
+

     /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTFONTPAGE_FACETEXTCTRL
     void OnFaceTextCtrlUpdated( wxCommandEvent& event );
 
     /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTFONTPAGE_SIZETEXTCTRL
     void OnSizeTextCtrlUpdated( wxCommandEvent& event );
 
     /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTFONTPAGE_FACETEXTCTRL
     void OnFaceTextCtrlUpdated( wxCommandEvent& event );
 
     /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTFONTPAGE_SIZETEXTCTRL
     void OnSizeTextCtrlUpdated( wxCommandEvent& event );
 

+    /// wxEVT_SCROLL_LINEUP event handler for ID_RICHTEXTFONTPAGE_SPINBUTTONS
+    void OnRichtextfontpageSpinbuttonsUp( wxSpinEvent& event );
+
+    /// wxEVT_SCROLL_LINEDOWN event handler for ID_RICHTEXTFONTPAGE_SPINBUTTONS
+    void OnRichtextfontpageSpinbuttonsDown( wxSpinEvent& event );
+
+    /// wxEVT_COMMAND_CHOICE_SELECTED event handler for ID_RICHTEXTFONTPAGE_SIZE_UNITS
+    void OnRichtextfontpageSizeUnitsSelected( wxCommandEvent& event );
+

     /// wxEVT_COMMAND_LISTBOX_SELECTED event handler for ID_RICHTEXTFONTPAGE_SIZELISTBOX
     void OnSizeListBoxSelected( wxCommandEvent& event );
 
     /// wxEVT_COMMAND_LISTBOX_SELECTED event handler for ID_RICHTEXTFONTPAGE_SIZELISTBOX
     void OnSizeListBoxSelected( wxCommandEvent& event );
 


@@ -97,6 +115,18 @@ public:
     /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL
     void OnUnderliningCtrlSelected( wxCommandEvent& event );
 
     /// 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
 ////@end wxRichTextFontPage event handler declarations
 
 ////@begin wxRichTextFontPage member function declarations


@@ -113,31 +143,51 @@ public:
 
 ////@begin wxRichTextFontPage member variables
     wxTextCtrl* m_faceTextCtrl;
 
 ////@begin wxRichTextFontPage member variables
     wxTextCtrl* m_faceTextCtrl;

-    wxRichTextFontListBox* m_faceListBox;

     wxTextCtrl* m_sizeTextCtrl;
     wxTextCtrl* m_sizeTextCtrl;

+    wxSpinButton* m_fontSizeSpinButtons;
+    wxChoice* m_sizeUnitsCtrl;
+    wxBoxSizer* m_fontListBoxParent;
+    wxRichTextFontListBox* m_faceListBox;

     wxListBox* m_sizeListBox;
     wxComboBox* m_styleCtrl;
     wxComboBox* m_weightCtrl;
     wxComboBox* m_underliningCtrl;
     wxListBox* m_sizeListBox;
     wxComboBox* m_styleCtrl;
     wxComboBox* m_weightCtrl;
     wxComboBox* m_underliningCtrl;

+    wxCheckBox* m_textColourLabel;

     wxRichTextColourSwatchCtrl* m_colourCtrl;
     wxRichTextColourSwatchCtrl* m_colourCtrl;

+    wxCheckBox* m_bgColourLabel;
+    wxRichTextColourSwatchCtrl* m_bgColourCtrl;
+    wxCheckBox* m_strikethroughCtrl;
+    wxCheckBox* m_capitalsCtrl;
+    wxCheckBox* m_superscriptCtrl;
+    wxCheckBox* m_subscriptCtrl;

     wxRichTextFontPreviewCtrl* m_previewCtrl;
     /// Control identifiers
     enum {
         ID_RICHTEXTFONTPAGE = 10000,
         ID_RICHTEXTFONTPAGE_FACETEXTCTRL = 10001,
     wxRichTextFontPreviewCtrl* m_previewCtrl;
     /// Control identifiers
     enum {
         ID_RICHTEXTFONTPAGE = 10000,
         ID_RICHTEXTFONTPAGE_FACETEXTCTRL = 10001,

-        ID_RICHTEXTFONTPAGE_FACELISTBOX = 10002,

         ID_RICHTEXTFONTPAGE_SIZETEXTCTRL = 10005,
         ID_RICHTEXTFONTPAGE_SIZETEXTCTRL = 10005,

+        ID_RICHTEXTFONTPAGE_SPINBUTTONS = 10018,
+        ID_RICHTEXTFONTPAGE_SIZE_UNITS = 10017,
+        ID_RICHTEXTFONTPAGE_FACELISTBOX = 10002,

         ID_RICHTEXTFONTPAGE_SIZELISTBOX = 10006,
         ID_RICHTEXTFONTPAGE_STYLECTRL = 10007,
         ID_RICHTEXTFONTPAGE_WEIGHTCTRL = 10004,
         ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL = 10008,
         ID_RICHTEXTFONTPAGE_SIZELISTBOX = 10006,
         ID_RICHTEXTFONTPAGE_STYLECTRL = 10007,
         ID_RICHTEXTFONTPAGE_WEIGHTCTRL = 10004,
         ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL = 10008,

+        ID_RICHTEXTFONTPAGE_COLOURCTRL_LABEL = 10015,

         ID_RICHTEXTFONTPAGE_COLOURCTRL = 10009,
         ID_RICHTEXTFONTPAGE_COLOURCTRL = 10009,

+        ID_RICHTEXTFONTPAGE_BGCOLOURCTRL_LABEL = 10016,
+        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;
         ID_RICHTEXTFONTPAGE_PREVIEWCTRL = 10003
     };
 ////@end wxRichTextFontPage member variables
 
     bool m_dontUpdate;
     bool m_colourPresent;

+    bool m_bgColourPresent;

 };
 
 #endif
 };
 
 #endif