X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97ff49b3834325cfe53813aeb53d326d7661f184..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/richtext/richtextindentspage.h?ds=sidebyside diff --git a/include/wx/richtext/richtextindentspage.h b/include/wx/richtext/richtextindentspage.h index eb61c598d0..eaebc469a4 100644 --- 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 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _RICHTEXTINDENTSPAGE_H_ @@ -16,6 +16,8 @@ * Includes */ +#include "wx/richtext/richtextdialogpage.h" + ////@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 -#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 -/*! - * Compatibility - */ - -#ifndef wxCLOSE_BOX -#define wxCLOSE_BOX 0x1000 -#endif - /*! * wxRichTextIndentsSpacingPage class declaration */ -class WXDLLIMPEXP_RICHTEXT wxRichTextIndentsSpacingPage: public wxPanel +class WXDLLIMPEXP_RICHTEXT wxRichTextIndentsSpacingPage: public wxRichTextDialogPage { DECLARE_DYNAMIC_CLASS( wxRichTextIndentsSpacingPage ) DECLARE_EVENT_TABLE() + DECLARE_HELP_PROVISION() 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 - 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(); @@ -79,7 +74,7 @@ public: void UpdatePreview(); /// Gets the attributes associated with the main formatting dialog - wxTextAttrEx* GetAttributes(); + wxRichTextAttr* GetAttributes(); ////@begin wxRichTextIndentsSpacingPage event handler declarations @@ -107,6 +102,9 @@ public: /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT void OnIndentRightUpdated( wxCommandEvent& event ); + /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL + void OnRichtextOutlinelevelSelected( wxCommandEvent& event ); + /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE void OnSpacingBeforeUpdated( wxCommandEvent& event ); @@ -139,9 +137,11 @@ public: wxTextCtrl* m_indentLeft; wxTextCtrl* m_indentLeftFirst; wxTextCtrl* m_indentRight; + wxComboBox* m_outlineLevelCtrl; wxTextCtrl* m_spacingBefore; wxTextCtrl* m_spacingAfter; wxComboBox* m_spacingLine; + wxCheckBox* m_pageBreakCtrl; 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_OUTLINELEVEL = 10105, 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