Fix part of [ 1570325 ] wxAnimationCtrl for wxAdv library

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

diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h
index 2fb9680281fd62be9d6e55e3250b9e25862630e4..fc23fd3f2a281dbb6c8db3e418de2320e3d6ae06 100644 (file)
--- a/include/wx/richtext/richtextformatdlg.h
+++ b/include/wx/richtext/richtextformatdlg.h
@@ -21,6 +21,8 @@
 #if wxUSE_RICHTEXT
 
 #include "wx/propdlg.h"
 #if wxUSE_RICHTEXT
 
 #include "wx/propdlg.h"

+#include "wx/bookctrl.h"
+

 #if wxUSE_HTML
 #include "wx/htmllbox.h"
 #endif
 #if wxUSE_HTML
 #include "wx/htmllbox.h"
 #endif


@@ -28,7 +30,6 @@
 #include "wx/richtext/richtextbuffer.h"
 #include "wx/richtext/richtextstyles.h"
 
 #include "wx/richtext/richtextbuffer.h"
 #include "wx/richtext/richtextstyles.h"
 

-class WXDLLEXPORT wxNotebookEvent;

 class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog;
 class WXDLLIMPEXP_CORE wxImageList;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog;
 class WXDLLIMPEXP_CORE wxImageList;
 


@@ -145,7 +146,10 @@ public:
 
     /// Apply the styles when a different tab is selected, so the previews are
     /// up to date
 
     /// Apply the styles when a different tab is selected, so the previews are
     /// up to date

-    void OnTabChanged(wxNotebookEvent& event);
+    void OnTabChanged(wxBookCtrlEvent& event);
+
+    /// Respond to help command
+    void OnHelp(wxCommandEvent& event);

 
     /// Set/get image list
     void SetImageList(wxImageList* imageList) { m_imageList = imageList; }
 
     /// Set/get image list
     void SetImageList(wxImageList* imageList) { m_imageList = imageList; }


@@ -164,12 +168,16 @@ public:
     /// Helper for pages to get the style
     static wxRichTextStyleDefinition* GetDialogStyleDefinition(wxWindow* win);
 
     /// Helper for pages to get the style
     static wxRichTextStyleDefinition* GetDialogStyleDefinition(wxWindow* win);
 

+    /// Map book control page index to our page id
+    void AddPageId(int id) { m_pageIds.Add(id); }
+

 protected:
 
     wxImageList*                                m_imageList;
     wxTextAttrEx                                m_attributes;
     wxRichTextStyleDefinition*                  m_styleDefinition;
     wxRichTextStyleSheet*                       m_styleSheet;
 protected:
 
     wxImageList*                                m_imageList;
     wxTextAttrEx                                m_attributes;
     wxRichTextStyleDefinition*                  m_styleDefinition;
     wxRichTextStyleSheet*                       m_styleSheet;

+    wxArrayInt                                  m_pageIds; // mapping of book control indexes to page ids

 
     static wxRichTextFormattingDialogFactory*   ms_FormattingDialogFactory;
 
 
     static wxRichTextFormattingDialogFactory*   ms_FormattingDialogFactory;
 


@@ -205,7 +213,6 @@ public:
     wxRichTextColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
     ~wxRichTextColourSwatchCtrl();
 
     wxRichTextColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
     ~wxRichTextColourSwatchCtrl();
 

-    void OnPaint(wxPaintEvent& event);

     void OnMouseEvent(wxMouseEvent& event);
 
     void SetColour(const wxColour& colour) { m_colour = colour; SetBackgroundColour(m_colour); }
     void OnMouseEvent(wxMouseEvent& event);
 
     void SetColour(const wxColour& colour) { m_colour = colour; SetBackgroundColour(m_colour); }


@@ -278,4 +285,3 @@ private:
 
 #endif
     // _WX_RICHTEXTFORMATDLG_H_
 
 #endif
     // _WX_RICHTEXTFORMATDLG_H_

-