Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/richtext/richtextbulletspage.h b/include/wx/richtext/richtextbulletspage.h
index bbfcc893ba0808c26997f146ec9ca4077737f904..88ea4eba2d9945dd43a30f321ab635e32cd3cb72 100644 (file)
--- a/include/wx/richtext/richtextbulletspage.h
+++ b/include/wx/richtext/richtextbulletspage.h
@@ -15,6 +15,8 @@
 /*!
  * Includes
  */
 /*!
  * Includes
  */

+
+#include "wx/richtext/richtextdialogpage.h"

 #include "wx/spinbutt.h"        // for wxSpinEvent
 
 /*!
 #include "wx/spinbutt.h"        // for wxSpinEvent
 
 /*!


@@ -32,6 +34,7 @@ class wxRichTextCtrl;
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL

+#define SYMBOL_WXRICHTEXTBULLETSPAGE_TITLE wxEmptyString

 #define SYMBOL_WXRICHTEXTBULLETSPAGE_IDNAME ID_RICHTEXTBULLETSPAGE
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION wxDefaultPosition
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_IDNAME ID_RICHTEXTBULLETSPAGE
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION wxDefaultPosition


@@ -41,10 +44,11 @@ class wxRichTextCtrl;
  * wxRichTextBulletsPage class declaration
  */
 
  * wxRichTextBulletsPage class declaration
  */
 

-class WXDLLIMPEXP_RICHTEXT wxRichTextBulletsPage: public wxPanel
+class WXDLLIMPEXP_RICHTEXT wxRichTextBulletsPage: public wxRichTextDialogPage

 {
     DECLARE_DYNAMIC_CLASS( wxRichTextBulletsPage )
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS( wxRichTextBulletsPage )
     DECLARE_EVENT_TABLE()

+    DECLARE_HELP_PROVISION()

 
 public:
     /// Constructors
 
 public:
     /// Constructors


@@ -68,7 +72,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

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

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