X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97ff49b3834325cfe53813aeb53d326d7661f184..ac22204b1b6013f7e53951835d2dc9168eaa004c:/src/richtext/richtextformatdlg.cpp

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index 9a7d80afd8..7c21d4c062 100644
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -16,7 +16,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
+#if wxUSE_RICHTEXT
+
+#include "wx/richtext/richtextformatdlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/listbox.h"
@@ -30,39 +32,50 @@
     #include "wx/bitmap.h"
     #include "wx/dcclient.h"
     #include "wx/frame.h"
-    #include "wx/imaglist.h"
     #include "wx/checkbox.h"
     #include "wx/button.h"
 #endif // WX_PRECOMP
 
-#if wxUSE_RICHTEXT
-
 #include "wx/bookctrl.h"
 #include "wx/colordlg.h"
-#include "wx/fontenum.h"
 #include "wx/settings.h"
 #include "wx/module.h"
+#include "wx/imaglist.h"
 
-#include "wx/richtext/richtextformatdlg.h"
 #include "wx/richtext/richtextctrl.h"
 #include "wx/richtext/richtextstyles.h"
 
+#ifdef __WXMAC__
+#include "../../src/richtext/richtextfontpage.cpp"
+#include "../../src/richtext/richtextindentspage.cpp"
+#include "../../src/richtext/richtexttabspage.cpp"
+#include "../../src/richtext/richtextbulletspage.cpp"
+#include "../../src/richtext/richtextstylepage.cpp"
+#include "../../src/richtext/richtextliststylepage.cpp"
+#else
 #include "richtextfontpage.cpp"
 #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"
+#endif
 
-#ifdef __WXMAC__
+#if 0 // def __WXMAC__
 #define wxRICHTEXT_USE_TOOLBOOK true
 #else
 #define wxRICHTEXT_USE_TOOLBOOK false
 #endif
 
+bool wxRichTextFormattingDialog::sm_showToolTips = false;
+
 IMPLEMENT_CLASS(wxRichTextFormattingDialog, wxPropertySheetDialog)
 
 BEGIN_EVENT_TABLE(wxRichTextFormattingDialog, wxPropertySheetDialog)
-    EVT_NOTEBOOK_PAGE_CHANGED(-1, wxRichTextFormattingDialog::OnTabChanged)
+    EVT_BOOKCTRL_PAGE_CHANGED(wxID_ANY, wxRichTextFormattingDialog::OnTabChanged)
 END_EVENT_TABLE()
 
 wxRichTextFormattingDialogFactory* wxRichTextFormattingDialog::ms_FormattingDialogFactory = NULL;
@@ -90,7 +103,7 @@ bool wxRichTextFormattingDialog::Create(long flags, wxWindow* parent, const wxSt
     GetFormattingDialogFactory()->SetSheetStyle(this);
 
     wxPropertySheetDialog::Create(parent, id, title, pos, sz,
-        style | (int)wxPlatform::IfNot(wxWinCE, resizeBorder)
+        style | (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder)
     );
 
     GetFormattingDialogFactory()->CreateButtons(this);
@@ -168,7 +181,7 @@ bool wxRichTextFormattingDialog::UpdateDisplay()
 
 /// Apply the styles when a different tab is selected, so the previews are
 /// up to date
-void wxRichTextFormattingDialog::OnTabChanged(wxNotebookEvent& event)
+void wxRichTextFormattingDialog::OnTabChanged(wxBookCtrlEvent& event)
 {
     if (GetBookCtrl() != event.GetEventObject())
     {
@@ -193,6 +206,18 @@ void wxRichTextFormattingDialog::OnTabChanged(wxNotebookEvent& event)
     }
 }
 
+/// Respond to help command
+void wxRichTextFormattingDialog::OnHelp(wxCommandEvent& event)
+{
+    int selPage = GetBookCtrl()->GetSelection();
+    if (selPage != wxNOT_FOUND)
+    {
+        int pageId = m_pageIds[selPage];
+        if (!GetFormattingDialogFactory()->ShowHelp(pageId, this))
+            event.Skip();
+    }
+}
+
 void wxRichTextFormattingDialog::SetFormattingDialogFactory(wxRichTextFormattingDialogFactory* factory)
 {
     if (ms_FormattingDialogFactory)
@@ -212,6 +237,7 @@ bool wxRichTextFormattingDialogFactory::CreatePages(long pages, wxRichTextFormat
 
     int availablePageCount = GetPageIdCount();
     int i;
+    bool selected = false;
     for (i = 0; i < availablePageCount; i ++)
     {
         int pageId = GetPageId(i);
@@ -223,10 +249,14 @@ bool wxRichTextFormattingDialogFactory::CreatePages(long pages, wxRichTextFormat
             if (panel)
             {
                 int imageIndex = GetPageImage(pageId);
-                dialog->GetBookCtrl()->AddPage(panel, title, false, imageIndex);
+                dialog->GetBookCtrl()->AddPage(panel, title, !selected, imageIndex);
+                selected = true;
+
+                dialog->AddPageId(pageId);
             }
         }
     }
+
     return true;
 }
 
@@ -263,6 +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;
 }
@@ -275,9 +313,10 @@ int wxRichTextFormattingDialogFactory::GetPageId(int i) const
         wxRICHTEXT_FORMAT_FONT,
         wxRICHTEXT_FORMAT_INDENTS_SPACING,
         wxRICHTEXT_FORMAT_BULLETS,
-        wxRICHTEXT_FORMAT_TABS };
+        wxRICHTEXT_FORMAT_TABS,
+        wxRICHTEXT_FORMAT_LIST_STYLE };
 
-    if (i < 0 || i > 4)
+    if (i < 0 || i > 5)
         return -1;
 
     return pages[i];
@@ -286,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
@@ -318,7 +361,8 @@ bool wxRichTextFormattingDialogFactory::CreateButtons(wxRichTextFormattingDialog
     // If using a toolbook, also follow Mac style and don't create buttons
     int flags = wxOK|wxCANCEL;
 #ifndef __WXWINCE__
-    flags |= wxHELP;
+    if (dialog->GetWindowStyleFlag() & wxRICHTEXT_FORMAT_HELP_BUTTON)
+        flags |= wxHELP;
 #endif
 
     if (!useToolBook)
@@ -439,6 +483,7 @@ void wxRichTextColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
         wxColourData data;
         data.SetChooseFull(true);
         data.SetColour(m_colour);
+#if wxUSE_COLOURDLG
         wxColourDialog *dialog = new wxColourDialog(parent, &data);
         // Crashes on wxMac (no m_peer)
 #ifndef __WXMAC__
@@ -451,6 +496,7 @@ void wxRichTextColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
             SetBackgroundColour(m_colour);
         }
         dialog->Destroy();
+#endif // wxUSE_COLOURDLG
         Refresh();
 
         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
@@ -515,9 +561,7 @@ int wxRichTextFontListBox::SetFaceNameSelection(const wxString& name)
 /// Updates the font list
 void wxRichTextFontListBox::UpdateFonts()
 {
-    wxFontEnumerator enumerator;
-    enumerator.EnumerateFacenames();
-    wxArrayString facenames = enumerator.GetFacenames();
+    wxArrayString facenames = wxRichTextCtrl::GetAvailableFontNames();
     m_faceNames = facenames;
     m_faceNames.Sort();
 
@@ -576,4 +620,3 @@ wxString wxRichTextFontListBox::CreateHTML(const wxString& facename) const
 
 #endif
     // wxUSE_RICHTEXT
-