Added the ability to use built-in bullet styles, currently standard/circle or standard/square.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,8 +17,8 @@
|
||||
*/
|
||||
|
||||
////@begin includes
|
||||
#include "wx/statline.h"
|
||||
#include "wx/spinctrl.h"
|
||||
#include "wx/statline.h"
|
||||
////@end includes
|
||||
|
||||
/*!
|
||||
@@ -81,11 +81,44 @@ public:
|
||||
/// Update for number-related controls
|
||||
void OnNumberUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// Update for standard bullet-related controls
|
||||
void OnStandardBulletUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
////@begin wxRichTextBulletsPage event handler declarations
|
||||
|
||||
/// wxEVT_COMMAND_LISTBOX_SELECTED event handler for ID_RICHTEXTBULLETSPAGE_STYLELISTBOX
|
||||
void OnStylelistboxSelected( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTBULLETSPAGE_PERIODCTRL
|
||||
void OnPeriodctrlClick( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_PERIODCTRL
|
||||
void OnPeriodctrlUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL
|
||||
void OnParenthesesctrlClick( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL
|
||||
void OnParenthesesctrlUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC
|
||||
void OnNumberstaticUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_SPINCTRL_UPDATED event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlUpdated( wxSpinEvent& event );
|
||||
|
||||
/// wxEVT_SCROLL_LINEUP event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlUp( wxSpinEvent& event );
|
||||
|
||||
/// wxEVT_SCROLL_LINEDOWN event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlDown( wxSpinEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlTextUpdated( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC
|
||||
void OnSymbolstaticUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
@@ -113,35 +146,17 @@ public:
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL
|
||||
void OnSymbolfontctrlUIUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC
|
||||
void OnNumberstaticUpdate( wxUpdateUIEvent& event );
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NAMESTATIC
|
||||
void OnNamestaticUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_SPINCTRL_UPDATED event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlUpdated( wxSpinEvent& event );
|
||||
/// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
|
||||
void OnNamectrlSelected( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_SCROLL_LINEUP event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlUp( wxSpinEvent& event );
|
||||
/// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
|
||||
void OnNamectrlUpdated( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_SCROLL_LINEDOWN event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlDown( wxSpinEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlTextUpdated( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
|
||||
void OnNumberctrlUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL
|
||||
void OnParenthesesctrlClick( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL
|
||||
void OnParenthesesctrlUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTBULLETSPAGE_PERIODCTRL
|
||||
void OnPeriodctrlClick( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_PERIODCTRL
|
||||
void OnPeriodctrlUpdate( wxUpdateUIEvent& event );
|
||||
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
|
||||
void OnNamectrlUIUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
////@end wxRichTextBulletsPage event handler declarations
|
||||
|
||||
@@ -159,24 +174,27 @@ public:
|
||||
|
||||
////@begin wxRichTextBulletsPage member variables
|
||||
wxListBox* m_styleListBox;
|
||||
wxCheckBox* m_periodCtrl;
|
||||
wxCheckBox* m_parenthesesCtrl;
|
||||
wxSpinCtrl* m_numberCtrl;
|
||||
wxComboBox* m_symbolCtrl;
|
||||
wxComboBox* m_symbolFontCtrl;
|
||||
wxSpinCtrl* m_numberCtrl;
|
||||
wxCheckBox* m_parenthesesCtrl;
|
||||
wxCheckBox* m_periodCtrl;
|
||||
wxComboBox* m_bulletNameCtrl;
|
||||
wxRichTextCtrl* m_previewCtrl;
|
||||
/// Control identifiers
|
||||
enum {
|
||||
ID_RICHTEXTBULLETSPAGE = 10300,
|
||||
ID_RICHTEXTBULLETSPAGE_STYLELISTBOX = 10305,
|
||||
ID_RICHTEXTBULLETSPAGE_PERIODCTRL = 10313,
|
||||
ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL = 10311,
|
||||
ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC = 10302,
|
||||
ID_RICHTEXTBULLETSPAGE_NUMBERCTRL = 10310,
|
||||
ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC = 10301,
|
||||
ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL = 10307,
|
||||
ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL = 10308,
|
||||
ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL = 10309,
|
||||
ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC = 10302,
|
||||
ID_RICHTEXTBULLETSPAGE_NUMBERCTRL = 10310,
|
||||
ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL = 10311,
|
||||
ID_RICHTEXTBULLETSPAGE_PERIODCTRL = 10313,
|
||||
ID_RICHTEXTBULLETSPAGE_NAMESTATIC = 10303,
|
||||
ID_RICHTEXTBULLETSPAGE_NAMECTRL = 10304,
|
||||
ID_RICHTEXTBULLETSPAGE_PREVIEW_CTRL = 10314
|
||||
};
|
||||
////@end wxRichTextBulletsPage member variables
|
||||
|
Reference in New Issue
Block a user