Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/richtext/richtexttabspage.h b/include/wx/richtext/richtexttabspage.h
index 9c5eecc6dda1a0b6002f2ffe2b846e93a857eae7..1495c664df10b22b4c0c1e5073abecc81fea4ddf 100644 (file)
--- a/include/wx/richtext/richtexttabspage.h
+++ b/include/wx/richtext/richtexttabspage.h
@@ -16,6 +16,8 @@
  * Includes
  */
 
  * Includes
  */
 

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

 ////@begin includes
 ////@end includes
 
 ////@begin includes
 ////@end includes
 


@@ -32,7 +34,7 @@
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTTABSPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
 
 ////@begin control identifiers
 #define SYMBOL_WXRICHTEXTTABSPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL

-#define SYMBOL_WXRICHTEXTTABSPAGE_TITLE _("wxRichTextFontPage")
+#define SYMBOL_WXRICHTEXTTABSPAGE_TITLE wxEmptyString

 #define SYMBOL_WXRICHTEXTTABSPAGE_IDNAME ID_RICHTEXTTABSPAGE
 #define SYMBOL_WXRICHTEXTTABSPAGE_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTTABSPAGE_POSITION wxDefaultPosition
 #define SYMBOL_WXRICHTEXTTABSPAGE_IDNAME ID_RICHTEXTTABSPAGE
 #define SYMBOL_WXRICHTEXTTABSPAGE_SIZE wxSize(400, 300)
 #define SYMBOL_WXRICHTEXTTABSPAGE_POSITION wxDefaultPosition


@@ -42,18 +44,19 @@
  * wxRichTextTabsPage class declaration
  */
 
  * wxRichTextTabsPage class declaration
  */
 

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

 {
     DECLARE_DYNAMIC_CLASS( wxRichTextTabsPage )
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS( wxRichTextTabsPage )
     DECLARE_EVENT_TABLE()

+    DECLARE_HELP_PROVISION()

 
 public:
     /// Constructors
     wxRichTextTabsPage( );
 
 public:
     /// Constructors
     wxRichTextTabsPage( );

-    wxRichTextTabsPage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTTABSPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTTABSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTTABSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTTABSPAGE_STYLE );
+    wxRichTextTabsPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTTABSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTTABSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTTABSPAGE_STYLE );

 
     /// Creation
 
     /// Creation

-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTTABSPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTTABSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTTABSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTTABSPAGE_STYLE );
+    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTTABSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTTABSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTTABSPAGE_STYLE );

 
     /// Creates the controls and sizers
     void CreateControls();
 
     /// Creates the controls and sizers
     void CreateControls();


@@ -69,7 +72,7 @@ public:
     virtual void SortTabs();
 
     /// Gets the attributes associated with the main formatting dialog
     virtual void SortTabs();
 
     /// Gets the attributes associated with the main formatting dialog

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

 
 ////@begin wxRichTextTabsPage event handler declarations
 
 
 ////@begin wxRichTextTabsPage event handler declarations