Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/richtext/richtextindentspage.h b/include/wx/richtext/richtextindentspage.h
index eb61c598d0241b48713a90cd2b69cd36d9758e8b..cbd0ca8ee27d5aacbb6fd6b06515f16e9cc49e16 100644 (file)
--- a/include/wx/richtext/richtextindentspage.h
+++ b/include/wx/richtext/richtextindentspage.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        richtextindentspage.h
+// Name:        wx/richtext/richtextindentspage.h

 // Purpose:
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/3/2006 2:28:21 PM
 // Purpose:
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/3/2006 2:28:21 PM

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Copyright:   (c) Julian Smart

-// Licence:
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _RICHTEXTINDENTSPAGE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _RICHTEXTINDENTSPAGE_H_


@@ -16,6 +16,8 @@
  * Includes
  */
 
  * Includes
  */
 

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

 ////@begin includes
 #include "wx/statline.h"
 ////@end includes
 ////@begin includes
 #include "wx/statline.h"
 ////@end includes


@@ -34,36 +36,29 @@ class wxRichTextCtrl;
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL

-#define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_TITLE _("wxRichTextFontPage")
+#define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_TITLE wxEmptyString

 #define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_IDNAME ID_RICHTEXTINDENTSSPACINGPAGE
 #define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION wxDefaultPosition
 ////@end control identifiers
 
 #define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_IDNAME ID_RICHTEXTINDENTSSPACINGPAGE
 #define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION wxDefaultPosition
 ////@end control identifiers
 

-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-

 /*!
  * wxRichTextIndentsSpacingPage class declaration
  */
 
 /*!
  * wxRichTextIndentsSpacingPage class declaration
  */
 

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

 {
     DECLARE_DYNAMIC_CLASS( wxRichTextIndentsSpacingPage )
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS( wxRichTextIndentsSpacingPage )
     DECLARE_EVENT_TABLE()

+    DECLARE_HELP_PROVISION()

 
 public:
     /// Constructors
     wxRichTextIndentsSpacingPage( );
 
 public:
     /// Constructors
     wxRichTextIndentsSpacingPage( );

-    wxRichTextIndentsSpacingPage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE, long style = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE );
+    wxRichTextIndentsSpacingPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE, long style = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE );

 
     /// Creation
 
     /// Creation

-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE, long style = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE );
+    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE, long style = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE );

 
     /// Initialise members
     void Init();
 
     /// Initialise members
     void Init();


@@ -79,41 +74,44 @@ public:
     void UpdatePreview();
 
     /// Gets the attributes associated with the main formatting dialog
     void UpdatePreview();
 
     /// Gets the attributes associated with the main formatting dialog

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

 
 ////@begin wxRichTextIndentsSpacingPage event handler declarations
 
 
 ////@begin wxRichTextIndentsSpacingPage event handler declarations
 

-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_LEFT
+    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_LEFT

     void OnAlignmentLeftSelected( wxCommandEvent& event );
 
     void OnAlignmentLeftSelected( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_RIGHT
+    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_RIGHT

     void OnAlignmentRightSelected( wxCommandEvent& event );
 
     void OnAlignmentRightSelected( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_JUSTIFIED
+    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_JUSTIFIED

     void OnAlignmentJustifiedSelected( wxCommandEvent& event );
 
     void OnAlignmentJustifiedSelected( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_CENTRED
+    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_CENTRED

     void OnAlignmentCentredSelected( wxCommandEvent& event );
 
     void OnAlignmentCentredSelected( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_INDETERMINATE
+    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_INDETERMINATE

     void OnAlignmentIndeterminateSelected( wxCommandEvent& event );
 
     void OnAlignmentIndeterminateSelected( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT
+    /// wxEVT_TEXT event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT

     void OnIndentLeftUpdated( wxCommandEvent& event );
 
     void OnIndentLeftUpdated( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST
+    /// wxEVT_TEXT event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST

     void OnIndentLeftFirstUpdated( wxCommandEvent& event );
 
     void OnIndentLeftFirstUpdated( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT
+    /// wxEVT_TEXT event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT

     void OnIndentRightUpdated( wxCommandEvent& event );
 
     void OnIndentRightUpdated( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE
+    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL
+    void OnRichtextOutlinelevelSelected( wxCommandEvent& event );
+
+    /// wxEVT_TEXT event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE

     void OnSpacingBeforeUpdated( wxCommandEvent& event );
 
     void OnSpacingBeforeUpdated( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER
+    /// wxEVT_TEXT event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER

     void OnSpacingAfterUpdated( wxCommandEvent& event );
 
     void OnSpacingAfterUpdated( wxCommandEvent& event );
 

-    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE
+    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE

     void OnSpacingLineSelected( wxCommandEvent& event );
 
 ////@end wxRichTextIndentsSpacingPage event handler declarations
     void OnSpacingLineSelected( wxCommandEvent& event );
 
 ////@end wxRichTextIndentsSpacingPage event handler declarations


@@ -139,9 +137,11 @@ public:
     wxTextCtrl* m_indentLeft;
     wxTextCtrl* m_indentLeftFirst;
     wxTextCtrl* m_indentRight;
     wxTextCtrl* m_indentLeft;
     wxTextCtrl* m_indentLeftFirst;
     wxTextCtrl* m_indentRight;

+    wxComboBox* m_outlineLevelCtrl;

     wxTextCtrl* m_spacingBefore;
     wxTextCtrl* m_spacingAfter;
     wxComboBox* m_spacingLine;
     wxTextCtrl* m_spacingBefore;
     wxTextCtrl* m_spacingAfter;
     wxComboBox* m_spacingLine;

+    wxCheckBox* m_pageBreakCtrl;

     wxRichTextCtrl* m_previewCtrl;
     /// Control identifiers
     enum {
     wxRichTextCtrl* m_previewCtrl;
     /// Control identifiers
     enum {


@@ -154,9 +154,11 @@ public:
         ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT = 10103,
         ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST = 10104,
         ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT = 10113,
         ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT = 10103,
         ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST = 10104,
         ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT = 10113,

+        ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL = 10105,

         ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE = 10114,
         ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER = 10116,
         ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE = 10115,
         ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE = 10114,
         ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER = 10116,
         ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE = 10115,

+        ID_RICHTEXTINDENTSSPACINGPAGE_PAGEBREAK = 10106,

         ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL = 10109
     };
 ////@end wxRichTextIndentsSpacingPage member variables
         ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL = 10109
     };
 ////@end wxRichTextIndentsSpacingPage member variables