Restore DrawRadioButton to the main wxRenderer API, create a method overload for...

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

diff --git a/include/wx/richtext/richtextbulletspage.h b/include/wx/richtext/richtextbulletspage.h
index 63cfbd3f5ee823e4b5e62ef59a0b612e3c1a49a2..58681faa1b33f4fbb6b464e4442be28fdcc99a0d 100644 (file)
--- a/include/wx/richtext/richtextbulletspage.h
+++ b/include/wx/richtext/richtextbulletspage.h
@@ -15,11 +15,7 @@
 /*!
  * Includes
  */
 /*!
  * Includes
  */

-
-////@begin includes
-#include "wx/statline.h"
-#include "wx/spinctrl.h"
-////@end includes
+#include "wx/spinbutt.h"        // for wxSpinEvent

 
 /*!
  * Forward declarations
 
 /*!
  * Forward declarations


@@ -54,10 +50,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();


@@ -73,7 +69,7 @@ public:
     virtual bool TransferDataToWindow();
 
     /// Gets the attributes associated with the main formatting dialog
     virtual bool TransferDataToWindow();
 
     /// Gets the attributes associated with the main formatting dialog

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

 
     /// Update for symbol-related controls
     void OnSymbolUpdate( wxUpdateUIEvent& event );
 
     /// Update for symbol-related controls
     void OnSymbolUpdate( wxUpdateUIEvent& event );