X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dadd4f5523e6ab9b489632f478958cd6dc8d03aa..1ffc8d7a55af1c253ca363bb0fbdda26bb4c9c65:/src/richtext/richtextformatdlg.cpp?ds=sidebyside diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index 13a7d85a84..7c21d4c062 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -57,8 +57,11 @@ #include "richtextindentspage.cpp" #include "richtexttabspage.cpp" #include "richtextbulletspage.cpp" +// Digital Mars can't cope with this much code +#ifndef __DMC__ + #include "richtextliststylepage.cpp" +#endif #include "richtextstylepage.cpp" -#include "richtextliststylepage.cpp" #endif #if 0 // def __WXMAC__ @@ -248,7 +251,7 @@ bool wxRichTextFormattingDialogFactory::CreatePages(long pages, wxRichTextFormat int imageIndex = GetPageImage(pageId); dialog->GetBookCtrl()->AddPage(panel, title, !selected, imageIndex); selected = true; - + dialog->AddPageId(pageId); } } @@ -290,12 +293,14 @@ wxPanel* wxRichTextFormattingDialogFactory::CreatePage(int page, wxString& title title = _("Bullets"); return page; } +#ifndef __DMC__ else if (page == wxRICHTEXT_FORMAT_LIST_STYLE) { wxRichTextListStylePage* page = new wxRichTextListStylePage(dialog->GetBookCtrl(), wxID_ANY); title = _("List Style"); return page; } +#endif else return NULL; } @@ -320,7 +325,11 @@ int wxRichTextFormattingDialogFactory::GetPageId(int i) const /// Get the number of available page identifiers int wxRichTextFormattingDialogFactory::GetPageIdCount() const { +#ifdef __DMC__ + return 5; +#else return 6; +#endif } /// Set the sheet style, called at the start of wxRichTextFormattingDialog::Create