X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/603f702b4a0e19ffa27cffc52872efaac1aa8c54..c78f0857639ac0f14a1c4cc3eaa48cde46dac9f2:/include/wx/richtext/richtextformatdlg.h

diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h
index 1f22c147f2..53abf8ac7d 100644
--- a/include/wx/richtext/richtextformatdlg.h
+++ b/include/wx/richtext/richtextformatdlg.h
@@ -22,6 +22,7 @@
 
 #include "wx/propdlg.h"
 #include "wx/bookctrl.h"
+#include "wx/withimages.h"
 
 #if wxUSE_HTML
 #include "wx/htmllbox.h"
@@ -32,7 +33,8 @@
 #include "wx/richtext/richtextuicustomization.h"
 
 class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFormattingDialog;
-class WXDLLIMPEXP_FWD_CORE wxImageList;
+class WXDLLIMPEXP_FWD_CORE wxComboBox;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
 
 /*!
  * Flags determining the pages and buttons to be created in the dialog
@@ -86,7 +88,7 @@ public:
     wxRichTextFormattingDialogFactory() {}
     virtual ~wxRichTextFormattingDialogFactory() {}
 
-// Overrideables
+// Overridables
 
     /// Create all pages, under the dialog's book control, also calling AddPage
     virtual bool CreatePages(long pages, wxRichTextFormattingDialog* dialog);
@@ -117,7 +119,8 @@ public:
  * Formatting dialog for a wxRichTextCtrl
  */
 
-class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog: public wxPropertySheetDialog
+class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog: public wxPropertySheetDialog,
+                                                       public wxWithImages
 {
 DECLARE_CLASS(wxRichTextFormattingDialog)
 DECLARE_HELP_PROVISION()
@@ -192,10 +195,6 @@ public:
     void OnHelp(wxCommandEvent& event);
     void OnUpdateHelp(wxUpdateUIEvent& event);
 
-    /// Set/get image list
-    void SetImageList(wxImageList* imageList) { m_imageList = imageList; }
-    wxImageList* GetImageList() const { return m_imageList; }
-
     /// Get/set formatting factory object
     static void SetFormattingDialogFactory(wxRichTextFormattingDialogFactory* factory);
     static wxRichTextFormattingDialogFactory* GetFormattingDialogFactory() { return ms_FormattingDialogFactory; }
@@ -235,7 +234,6 @@ public:
 
 protected:
 
-    wxImageList*                                m_imageList;
     wxRichTextAttr                              m_attributes;
     //wxRichTextAttr                              m_resetAttributes;
     wxRichTextStyleDefinition*                  m_styleDefinition;