Fix huge performance problem in wxStdInputStream when using MSVC8/9.

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

diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h
index fa9ac649a73c1f42f64679db7ed0b31a6e72bf63..ad21c024b155ee0eb657adbf60f99bf16ebf89b6 100644 (file)
--- a/include/wx/richtext/richtextstyledlg.h
+++ b/include/wx/richtext/richtextstyledlg.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        richtextstyledlg.h
-// Purpose:     
+// Name:        wx/richtext/richtextstyledlg.h
+// Purpose:
 // Author:      Julian Smart
-// Modified by: 
+// Modified by:
 // Created:     10/5/2006 12:05:31 PM
-// RCS-ID:      
+// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _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
  */
@@ -48,7 +54,7 @@ class wxRichTextCtrl;
 /*!
  * Flags for specifying permitted operations
  */
- 
+
 #define wxRICHTEXT_ORGANISER_DELETE_STYLES  0x0001
 #define wxRICHTEXT_ORGANISER_CREATE_STYLES  0x0002
 #define wxRICHTEXT_ORGANISER_APPLY_STYLES   0x0004
@@ -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)
@@ -72,33 +79,34 @@ class wxRichTextCtrl;
  * wxRichTextStyleOrganiserDialog class declaration
  */
 
-class wxRichTextStyleOrganiserDialog: public wxDialog
-{    
+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();
-    
+
     /// Initialise member variables
     void Init();
 
     /// Transfer data from/to window
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
-    
+
     /// Set/get style sheet
     void SetStyleSheet(wxRichTextStyleSheet* sheet) { m_richTextStyleSheet = sheet; }
     wxRichTextStyleSheet* GetStyleSheet() const { return m_richTextStyleSheet; }
-    
+
     /// Set/get control
     void SetRichTextCtrl(wxRichTextCtrl* ctrl) { m_richTextCtrl = ctrl; }
     wxRichTextCtrl* GetRichTextCtrl() const { return m_richTextCtrl; }
@@ -106,30 +114,30 @@ public:
     /// Set/get flags
     void SetFlags(int flags) { m_flags = flags; }
     int GetFlags() const { return m_flags; }
-    
+
     /// Show preview for given or selected preview
     void ShowPreview(int sel = -1);
-    
+
     /// Clears the preview
     void ClearPreview();
-    
+
     /// List selection
     void OnListSelection(wxCommandEvent& event);
-    
+
     /// Get/set restart numbering boolean
     bool GetRestartNumbering() const { return m_restartNumbering; }
     void SetRestartNumbering(bool restartNumbering) { m_restartNumbering = restartNumbering; }
-    
+
     /// Get selected style name or definition
     wxString GetSelectedStyle() const;
     wxRichTextStyleDefinition* GetSelectedStyleDefinition() const;
-    
+
     /// Apply the style
     bool ApplyStyle(wxRichTextCtrl* ctrl = NULL);
 
     /// Should we show tooltips?
     static bool ShowToolTips() { return sm_showToolTips; }
-    
+
     /// Determines whether tooltips will be shown
     static void SetShowToolTips(bool show) { sm_showToolTips = show; }
 
@@ -153,6 +161,12 @@ public:
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST
     void OnNewListUpdate( wxUpdateUIEvent& event );
 
+    /// wxEVT_COMMAND_BUTTON_CLICKED 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_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY
     void OnApplyClick( wxCommandEvent& event );
 
@@ -197,6 +211,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 +219,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,
@@ -226,7 +244,7 @@ private:
 
     wxRichTextCtrl*         m_richTextCtrl;
     wxRichTextStyleSheet*   m_richTextStyleSheet;
-    
+
     bool                    m_dontUpdate;
     int                     m_flags;
     static bool             sm_showToolTips;