deprecate OnScroll() which existed for compatibility only even before

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

diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h
index c74c9a49c04dd8703820fed104228cb657b4617c..403b1807083b6f1e74a97f4600aeb971a0ed616d 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_
@@ -33,6 +33,9 @@ class wxRichTextStyleListCtrl;
 class wxRichTextCtrl;
 ////@end forward declarations
 
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
+
 /*!
  * Control identifiers
  */
@@ -48,7 +51,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
@@ -73,32 +76,32 @@ class wxRichTextCtrl;
  */
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextStyleOrganiserDialog: public wxDialog
-{    
+{
     DECLARE_DYNAMIC_CLASS( wxRichTextStyleOrganiserDialog )
     DECLARE_EVENT_TABLE()
 
 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 +109,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; }
 
@@ -210,6 +213,7 @@ public:
     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,
@@ -226,7 +230,7 @@ private:
 
     wxRichTextCtrl*         m_richTextCtrl;
     wxRichTextStyleSheet*   m_richTextStyleSheet;
-    
+
     bool                    m_dontUpdate;
     int                     m_flags;
     static bool             sm_showToolTips;