Removed new function

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

diff --git a/include/wx/richtext/richtextbulletspage.h b/include/wx/richtext/richtextbulletspage.h
index 53aa6664becc2f4c2e31db5fcf25eca1d62cdc12..9972b66b6ddcee61afc9a733eb99c8b284da6f19 100644 (file)
--- a/include/wx/richtext/richtextbulletspage.h
+++ b/include/wx/richtext/richtextbulletspage.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/4/2006 10:32:31 AM
 // Purpose:
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/4/2006 10:32:31 AM

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

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

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _RICHTEXTBULLETSPAGE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _RICHTEXTBULLETSPAGE_H_


@@ -42,14 +42,6 @@ class wxRichTextCtrl;
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION wxDefaultPosition
 ////@end control identifiers
 
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION wxDefaultPosition
 ////@end control identifiers
 

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

 /*!
  * wxRichTextBulletsPage class declaration
  */
 /*!
  * wxRichTextBulletsPage class declaration
  */


@@ -62,10 +54,10 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextBulletsPage: public wxPanel
 public:
     /// Constructors
     wxRichTextBulletsPage( );
 public:
     /// Constructors
     wxRichTextBulletsPage( );

-    wxRichTextBulletsPage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTBULLETSPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE );
+    wxRichTextBulletsPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE );

 
     /// Creation
 
     /// Creation

-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTBULLETSPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE );
+    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE );

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


@@ -89,11 +81,35 @@ public:
     /// Update for number-related controls
     void OnNumberUpdate( wxUpdateUIEvent& event );
 
     /// 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 );
 
 ////@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_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTBULLETSPAGE_RIGHTPARENTHESISCTRL
+    void OnRightParenthesisCtrlClick( wxCommandEvent& event );
+
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_RIGHTPARENTHESISCTRL
+    void OnRightParenthesisCtrlUpdate( wxUpdateUIEvent& event );
+
+    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTBULLETSPAGE_BULLETALIGNMENTCTRL
+    void OnBulletAlignmentCtrlSelected( wxCommandEvent& event );
+

     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC
     void OnSymbolstaticUpdate( wxUpdateUIEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC
     void OnSymbolstaticUpdate( wxUpdateUIEvent& event );
 


@@ -121,6 +137,18 @@ public:
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL
     void OnSymbolfontctrlUIUpdate( wxUpdateUIEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL
     void OnSymbolfontctrlUIUpdate( wxUpdateUIEvent& event );
 

+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NAMESTATIC
+    void OnNamestaticUpdate( wxUpdateUIEvent& event );
+
+    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
+    void OnNamectrlSelected( wxCommandEvent& event );
+
+    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
+    void OnNamectrlUpdated( wxCommandEvent& event );
+
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
+    void OnNamectrlUIUpdate( wxUpdateUIEvent& event );
+

     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC
     void OnNumberstaticUpdate( wxUpdateUIEvent& event );
 
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC
     void OnNumberstaticUpdate( wxUpdateUIEvent& event );
 


@@ -139,18 +167,6 @@ public:
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
     void OnNumberctrlUpdate( wxUpdateUIEvent& 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 );
-

 ////@end wxRichTextBulletsPage event handler declarations
 
 ////@begin wxRichTextBulletsPage member function declarations
 ////@end wxRichTextBulletsPage event handler declarations
 
 ////@begin wxRichTextBulletsPage member function declarations


@@ -167,24 +183,31 @@ public:
 
 ////@begin wxRichTextBulletsPage member variables
     wxListBox* m_styleListBox;
 
 ////@begin wxRichTextBulletsPage member variables
     wxListBox* m_styleListBox;

+    wxCheckBox* m_periodCtrl;
+    wxCheckBox* m_parenthesesCtrl;
+    wxCheckBox* m_rightParenthesisCtrl;
+    wxComboBox* m_bulletAlignmentCtrl;

     wxComboBox* m_symbolCtrl;
     wxComboBox* m_symbolFontCtrl;
     wxComboBox* m_symbolCtrl;
     wxComboBox* m_symbolFontCtrl;

+    wxComboBox* m_bulletNameCtrl;

     wxSpinCtrl* m_numberCtrl;
     wxSpinCtrl* m_numberCtrl;

-    wxCheckBox* m_parenthesesCtrl;
-    wxCheckBox* m_periodCtrl;

     wxRichTextCtrl* m_previewCtrl;
     /// Control identifiers
     enum {
         ID_RICHTEXTBULLETSPAGE = 10300,
         ID_RICHTEXTBULLETSPAGE_STYLELISTBOX = 10305,
     wxRichTextCtrl* m_previewCtrl;
     /// Control identifiers
     enum {
         ID_RICHTEXTBULLETSPAGE = 10300,
         ID_RICHTEXTBULLETSPAGE_STYLELISTBOX = 10305,

+        ID_RICHTEXTBULLETSPAGE_PERIODCTRL = 10313,
+        ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL = 10311,
+        ID_RICHTEXTBULLETSPAGE_RIGHTPARENTHESISCTRL = 10306,
+        ID_RICHTEXTBULLETSPAGE_BULLETALIGNMENTCTRL = 10315,

         ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC = 10301,
         ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL = 10307,
         ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL = 10308,
         ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL = 10309,
         ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC = 10301,
         ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL = 10307,
         ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL = 10308,
         ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL = 10309,

+        ID_RICHTEXTBULLETSPAGE_NAMESTATIC = 10303,
+        ID_RICHTEXTBULLETSPAGE_NAMECTRL = 10304,

         ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC = 10302,
         ID_RICHTEXTBULLETSPAGE_NUMBERCTRL = 10310,
         ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC = 10302,
         ID_RICHTEXTBULLETSPAGE_NUMBERCTRL = 10310,

-        ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL = 10311,
-        ID_RICHTEXTBULLETSPAGE_PERIODCTRL = 10313,

         ID_RICHTEXTBULLETSPAGE_PREVIEW_CTRL = 10314
     };
 ////@end wxRichTextBulletsPage member variables
         ID_RICHTEXTBULLETSPAGE_PREVIEW_CTRL = 10314
     };
 ////@end wxRichTextBulletsPage member variables