check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/include/wx/richtext/richtextliststylepage.h b/include/wx/richtext/richtextliststylepage.h
index 3fe88598e4b7d07583e84bdaa1e6cd090c379ddd..bbb86026a9496879d21352bafa6eadf1ee3a362c 100644 (file)
--- a/include/wx/richtext/richtextliststylepage.h
+++ b/include/wx/richtext/richtextliststylepage.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        richtextliststylepage.h
-// Purpose:     
+// Name:        wx/richtext/richtextliststylepage.h
+// Purpose:
 // Author:      Julian Smart
-// Modified by: 
+// Modified by:
 // Created:     10/18/2006 11:36:37 AM
-// RCS-ID:      
+// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _RICHTEXTLISTSTYLEPAGE_H_
@@ -38,18 +38,18 @@
  * wxRichTextListStylePage class declaration
  */
 
-class wxRichTextListStylePage: public wxPanel
-{    
+class WXDLLIMPEXP_RICHTEXT wxRichTextListStylePage: public wxPanel
+{
     DECLARE_DYNAMIC_CLASS( wxRichTextListStylePage )
     DECLARE_EVENT_TABLE()
 
 public:
     /// Constructors
     wxRichTextListStylePage( );
-    wxRichTextListStylePage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_STYLE );
+    wxRichTextListStylePage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_STYLE );
 
     /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_STYLE );
+    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_STYLE );
 
     /// Initialises member variables
     void Init();
@@ -63,9 +63,9 @@ public:
     /// Transfer data from/to window
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
-    
+
     /// Get attributes for selected level
-    wxTextAttrEx* GetAttributesForSelection();
+    wxTextAttr* GetAttributesForSelection();
 
     /// Update for symbol-related controls
     void OnSymbolUpdate( wxUpdateUIEvent& event );
@@ -73,12 +73,15 @@ public:
     /// Update for number-related controls
     void OnNumberUpdate( wxUpdateUIEvent& event );
 
+    /// Update for standard bullet-related controls
+    void OnStandardBulletUpdate( wxUpdateUIEvent& event );
+
     /// Just transfer to the window
     void DoTransferDataToWindow();
 
     /// Transfer from the window and preview
     void TransferAndPreview();
-    
+
 ////@begin wxRichTextListStylePage event handler declarations
 
     /// wxEVT_COMMAND_SPINCTRL_UPDATED event handler for ID_RICHTEXTLISTSTYLEPAGE_LEVEL
@@ -102,22 +105,43 @@ public:
     /// wxEVT_COMMAND_LISTBOX_SELECTED event handler for ID_RICHTEXTLISTSTYLEPAGE_STYLELISTBOX
     void OnStylelistboxSelected( wxCommandEvent& event );
 
+    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL
+    void OnPeriodctrlClick( wxCommandEvent& event );
+
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL
+    void OnPeriodctrlUpdate( wxUpdateUIEvent& event );
+
+    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL
+    void OnParenthesesctrlClick( wxCommandEvent& event );
+
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL
+    void OnParenthesesctrlUpdate( wxUpdateUIEvent& event );
+
+    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTLISTSTYLEPAGE_RIGHTPARENTHESISCTRL
+    void OnRightParenthesisCtrlClick( wxCommandEvent& event );
+
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_RIGHTPARENTHESISCTRL
+    void OnRightParenthesisCtrlUpdate( wxUpdateUIEvent& event );
+
+    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTLISTSTYLEPAGE_BULLETALIGNMENTCTRL
+    void OnBulletAlignmentCtrlSelected( wxCommandEvent& event );
+
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC
     void OnSymbolstaticUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL
+    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL
     void OnSymbolctrlSelected( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL
+    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL
     void OnSymbolctrlUpdated( wxCommandEvent& event );
 
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL
     void OnSymbolctrlUIUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_SYMBOL
     void OnChooseSymbolClick( wxCommandEvent& event );
 
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_SYMBOL
     void OnChooseSymbolUpdate( wxUpdateUIEvent& event );
 
     /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL
@@ -129,17 +153,17 @@ public:
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL
     void OnSymbolfontctrlUIUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL
-    void OnParenthesesctrlClick( wxCommandEvent& event );
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_NAMESTATIC
+    void OnNamestaticUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL
-    void OnParenthesesctrlUpdate( wxUpdateUIEvent& event );
+    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL
+    void OnNamectrlSelected( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL
-    void OnPeriodctrlClick( wxCommandEvent& event );
+    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL
+    void OnNamectrlUpdated( wxCommandEvent& event );
 
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL
-    void OnPeriodctrlUpdate( wxUpdateUIEvent& event );
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL
+    void OnNamectrlUIUpdate( wxUpdateUIEvent& event );
 
     /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTLISTSTYLEPAGE_ALIGNLEFT
     void OnRichtextliststylepageAlignleftSelected( wxCommandEvent& event );
@@ -191,10 +215,13 @@ public:
 ////@begin wxRichTextListStylePage member variables
     wxSpinCtrl* m_levelCtrl;
     wxListBox* m_styleListBox;
+    wxCheckBox* m_periodCtrl;
+    wxCheckBox* m_parenthesesCtrl;
+    wxCheckBox* m_rightParenthesisCtrl;
+    wxComboBox* m_bulletAlignmentCtrl;
     wxComboBox* m_symbolCtrl;
     wxComboBox* m_symbolFontCtrl;
-    wxCheckBox* m_parenthesesCtrl;
-    wxCheckBox* m_periodCtrl;
+    wxComboBox* m_bulletNameCtrl;
     wxRadioButton* m_alignmentLeft;
     wxRadioButton* m_alignmentRight;
     wxRadioButton* m_alignmentJustified;
@@ -215,12 +242,16 @@ public:
         ID_RICHTEXTLISTSTYLEPAGE_NOTEBOOK = 10618,
         ID_RICHTEXTLISTSTYLEPAGE_BULLETS = 10619,
         ID_RICHTEXTLISTSTYLEPAGE_STYLELISTBOX = 10620,
+        ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL = 10627,
+        ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL = 10626,
+        ID_RICHTEXTLISTSTYLEPAGE_RIGHTPARENTHESISCTRL = 10602,
+        ID_RICHTEXTLISTSTYLEPAGE_BULLETALIGNMENTCTRL = 10603,
         ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC = 10621,
-        ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL = 10622,
-        ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL = 10623,
+        ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL = 10622,
+        ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_SYMBOL = 10623,
         ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL = 10625,
-        ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL = 10626,
-        ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL = 10627,
+        ID_RICHTEXTLISTSTYLEPAGE_NAMESTATIC = 10600,
+        ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL = 10601,
         ID_RICHTEXTLISTSTYLEPAGE_SPACING = 10628,
         ID_RICHTEXTLISTSTYLEPAGE_ALIGNLEFT = 10629,
         ID_RICHTEXTLISTSTYLEPAGE_ALIGNRIGHT = 10630,