Fix default value for wxFontPickerCtrl's initial font parameter

[wxWidgets.git] / src / richtext / richtextformatdlg.cpp

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index e262d0850abfa2c580b43f0f41362ad28d928814..7c21d4c0622dbb98b4054a83911f2c02fd4c3e1d 100644 (file)
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -38,7 +38,6 @@
 
 #include "wx/bookctrl.h"
 #include "wx/colordlg.h"
 
 #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/settings.h"
 #include "wx/module.h"
 #include "wx/imaglist.h"


@@ -52,11 +51,16 @@
 #include "../../src/richtext/richtexttabspage.cpp"
 #include "../../src/richtext/richtextbulletspage.cpp"
 #include "../../src/richtext/richtextstylepage.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"
 #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
 
 #include "richtextstylepage.cpp"
 #endif
 


@@ -66,6 +70,8 @@
 #define wxRICHTEXT_USE_TOOLBOOK false
 #endif
 
 #define wxRICHTEXT_USE_TOOLBOOK false
 #endif
 

+bool wxRichTextFormattingDialog::sm_showToolTips = false;
+

 IMPLEMENT_CLASS(wxRichTextFormattingDialog, wxPropertySheetDialog)
 
 BEGIN_EVENT_TABLE(wxRichTextFormattingDialog, wxPropertySheetDialog)
 IMPLEMENT_CLASS(wxRichTextFormattingDialog, wxPropertySheetDialog)
 
 BEGIN_EVENT_TABLE(wxRichTextFormattingDialog, wxPropertySheetDialog)


@@ -245,7 +251,7 @@ bool wxRichTextFormattingDialogFactory::CreatePages(long pages, wxRichTextFormat
                 int imageIndex = GetPageImage(pageId);
                 dialog->GetBookCtrl()->AddPage(panel, title, !selected, imageIndex);
                 selected = true;
                 int imageIndex = GetPageImage(pageId);
                 dialog->GetBookCtrl()->AddPage(panel, title, !selected, imageIndex);
                 selected = true;

-                
+

                 dialog->AddPageId(pageId);
             }
         }
                 dialog->AddPageId(pageId);
             }
         }


@@ -287,6 +293,14 @@ wxPanel* wxRichTextFormattingDialogFactory::CreatePage(int page, wxString& title
         title = _("Bullets");
         return page;
     }
         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;
 }
     else
         return NULL;
 }


@@ -299,9 +313,10 @@ int wxRichTextFormattingDialogFactory::GetPageId(int i) const
         wxRICHTEXT_FORMAT_FONT,
         wxRICHTEXT_FORMAT_INDENTS_SPACING,
         wxRICHTEXT_FORMAT_BULLETS,
         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];
         return -1;
 
     return pages[i];


@@ -310,7 +325,11 @@ int wxRichTextFormattingDialogFactory::GetPageId(int i) const
 /// Get the number of available page identifiers
 int wxRichTextFormattingDialogFactory::GetPageIdCount() const
 {
 /// Get the number of available page identifiers
 int wxRichTextFormattingDialogFactory::GetPageIdCount() const
 {

+#ifdef __DMC__

     return 5;
     return 5;

+#else
+    return 6;
+#endif

 }
 
 /// Set the sheet style, called at the start of wxRichTextFormattingDialog::Create
 }
 
 /// Set the sheet style, called at the start of wxRichTextFormattingDialog::Create


@@ -342,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__
     // 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)
 #endif
 
     if (!useToolBook)


@@ -541,9 +561,7 @@ int wxRichTextFontListBox::SetFaceNameSelection(const wxString& name)
 /// Updates the font list
 void wxRichTextFontListBox::UpdateFonts()
 {
 /// 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();
 
     m_faceNames = facenames;
     m_faceNames.Sort();