X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41a852156fab5ee6075b3ab92f8230989547daac..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/richtext/richtextstyledlg.h?ds=sidebyside

diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h
index 8b5bc0d0c4..45256ba6d8 100644
--- a/include/wx/richtext/richtextstyledlg.h
+++ b/include/wx/richtext/richtextstyledlg.h
@@ -16,6 +16,8 @@
  * Includes
  */
 
+#include "wx/richtext/richtextuicustomization.h"
+
 ////@begin includes
 ////@end includes
 
@@ -31,8 +33,12 @@
 class wxBoxSizer;
 class wxRichTextStyleListCtrl;
 class wxRichTextCtrl;
+class wxStdDialogButtonSizer;
 ////@end forward declarations
 
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
+
 /*!
  * Control identifiers
  */
@@ -61,7 +67,8 @@ class wxRichTextCtrl;
 #define wxRICHTEXT_ORGANISER_SHOW_CHARACTER 0x0100
 #define wxRICHTEXT_ORGANISER_SHOW_PARAGRAPH 0x0200
 #define wxRICHTEXT_ORGANISER_SHOW_LIST      0x0400
-#define wxRICHTEXT_ORGANISER_SHOW_ALL       0x0800
+#define wxRICHTEXT_ORGANISER_SHOW_BOX       0x0800
+#define wxRICHTEXT_ORGANISER_SHOW_ALL       0x1000
 
 // Common combinations
 #define wxRICHTEXT_ORGANISER_ORGANISE (wxRICHTEXT_ORGANISER_SHOW_ALL|wxRICHTEXT_ORGANISER_DELETE_STYLES|wxRICHTEXT_ORGANISER_CREATE_STYLES|wxRICHTEXT_ORGANISER_APPLY_STYLES|wxRICHTEXT_ORGANISER_EDIT_STYLES|wxRICHTEXT_ORGANISER_RENAME_STYLES)
@@ -76,14 +83,15 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextStyleOrganiserDialog: public wxDialog
 {
     DECLARE_DYNAMIC_CLASS( wxRichTextStyleOrganiserDialog )
     DECLARE_EVENT_TABLE()
+    DECLARE_HELP_PROVISION()
 
 public:
     /// Constructors
     wxRichTextStyleOrganiserDialog( );
-    wxRichTextStyleOrganiserDialog( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_IDNAME, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );
+    wxRichTextStyleOrganiserDialog( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );
 
     /// Creation
-    bool Create( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_IDNAME, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );
+    bool Create( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );
 
     /// Creates the controls and sizers
     void CreateControls();
@@ -135,48 +143,57 @@ public:
 
 ////@begin wxRichTextStyleOrganiserDialog event handler declarations
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR
+    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR
     void OnNewCharClick( wxCommandEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR
     void OnNewCharUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA
+    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA
     void OnNewParaClick( wxCommandEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA
     void OnNewParaUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST
+    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST
     void OnNewListClick( wxCommandEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST
     void OnNewListUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY
+    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_BOX
+    void OnNewBoxClick( wxCommandEvent& event );
+
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_BOX
+    void OnNewBoxUpdate( wxUpdateUIEvent& event );
+
+    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY
     void OnApplyClick( wxCommandEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY
     void OnApplyUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME
+    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME
     void OnRenameClick( wxCommandEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME
     void OnRenameUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT
+    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT
     void OnEditClick( wxCommandEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT
     void OnEditUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE
+    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE
     void OnDeleteClick( wxCommandEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE
     void OnDeleteUpdate( wxUpdateUIEvent& event );
 
+    /// wxEVT_BUTTON event handler for wxID_HELP
+    void OnHelpClick( wxCommandEvent& event );
+
 ////@end wxRichTextStyleOrganiserDialog event handler declarations
 
 ////@begin wxRichTextStyleOrganiserDialog member function declarations
@@ -197,6 +214,7 @@ public:
     wxButton* m_newCharacter;
     wxButton* m_newParagraph;
     wxButton* m_newList;
+    wxButton* m_newBox;
     wxButton* m_applyStyle;
     wxButton* m_renameStyle;
     wxButton* m_editStyle;
@@ -204,16 +222,19 @@ public:
     wxButton* m_closeButton;
     wxBoxSizer* m_bottomButtonSizer;
     wxCheckBox* m_restartNumberingCtrl;
+    wxStdDialogButtonSizer* m_stdButtonSizer;
     wxButton* m_okButton;
     wxButton* m_cancelButton;
     /// Control identifiers
     enum {
         ID_RICHTEXTSTYLEORGANISERDIALOG = 10500,
         ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES = 10501,
+        ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE = 10510,
         ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW = 10509,
         ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR = 10504,
         ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA = 10505,
         ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST = 10508,
+        ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_BOX = 10512,
         ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY = 10503,
         ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME = 10502,
         ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT = 10506,