use iterators instead of c_str()

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

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index d65dedb3392b1f1a8bb741ebb918cae1b667c377..e93767e702983fa6fc9d0597ef5210d371fde590 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"


@@ -46,18 +45,33 @@
 #include "wx/richtext/richtextctrl.h"
 #include "wx/richtext/richtextstyles.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"
 #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"
 #include "richtextstylepage.cpp"

+#endif

 
 #if 0 // def __WXMAC__
 
 #if 0 // def __WXMAC__

-#define wxRICHTEXT_USE_TOOLBOOK true
+#define wxRICHTEXT_USE_TOOLBOOK 1

 #else
 #else

-#define wxRICHTEXT_USE_TOOLBOOK false
+#define wxRICHTEXT_USE_TOOLBOOK 0

 #endif
 
 #endif
 

+bool wxRichTextFormattingDialog::sm_showToolTips = false;
+

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


@@ -192,6 +206,18 @@ void wxRichTextFormattingDialog::OnTabChanged(wxBookCtrlEvent& 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)
 void wxRichTextFormattingDialog::SetFormattingDialogFactory(wxRichTextFormattingDialogFactory* factory)
 {
     if (ms_FormattingDialogFactory)


@@ -225,6 +251,8 @@ 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);

             }
         }
     }
             }
         }
     }


@@ -265,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;
 }


@@ -277,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];


@@ -288,26 +325,30 @@ 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
 bool wxRichTextFormattingDialogFactory::SetSheetStyle(wxRichTextFormattingDialog* dialog)
 {
 }
 
 /// Set the sheet style, called at the start of wxRichTextFormattingDialog::Create
 bool wxRichTextFormattingDialogFactory::SetSheetStyle(wxRichTextFormattingDialog* dialog)
 {

-    bool useToolBook = wxRICHTEXT_USE_TOOLBOOK;
-    if (useToolBook)
-    {
-        int sheetStyle = wxPROPSHEET_SHRINKTOFIT;
+#if wxRICHTEXT_USE_TOOLBOOK
+    int sheetStyle = wxPROPSHEET_SHRINKTOFIT;

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-        sheetStyle |= wxPROPSHEET_BUTTONTOOLBOOK;
+    sheetStyle |= wxPROPSHEET_BUTTONTOOLBOOK;

 #else
 #else

-        sheetStyle |= wxPROPSHEET_TOOLBOOK;
+    sheetStyle |= wxPROPSHEET_TOOLBOOK;

 #endif
 
 #endif
 

-        dialog->SetSheetStyle(sheetStyle);
-        dialog->SetSheetInnerBorder(0);
-        dialog->SetSheetOuterBorder(0);
-    }
+    dialog->SetSheetStyle(sheetStyle);
+    dialog->SetSheetInnerBorder(0);
+    dialog->SetSheetOuterBorder(0);
+#else
+       wxUnusedVar(dialog);
+#endif // wxRICHTEXT_USE_TOOLBOOK

 
     return true;
 }
 
     return true;
 }


@@ -315,16 +356,16 @@ bool wxRichTextFormattingDialogFactory::SetSheetStyle(wxRichTextFormattingDialog
 /// Create the main dialog buttons
 bool wxRichTextFormattingDialogFactory::CreateButtons(wxRichTextFormattingDialog* dialog)
 {
 /// Create the main dialog buttons
 bool wxRichTextFormattingDialogFactory::CreateButtons(wxRichTextFormattingDialog* dialog)
 {

-    bool useToolBook = wxRICHTEXT_USE_TOOLBOOK;
-
-    // If using a toolbook, also follow Mac style and don't create buttons

     int flags = wxOK|wxCANCEL;
 #ifndef __WXWINCE__
     int flags = wxOK|wxCANCEL;
 #ifndef __WXWINCE__

-    flags |= wxHELP;
+    if (dialog->GetWindowStyleFlag() & wxRICHTEXT_FORMAT_HELP_BUTTON)
+        flags |= wxHELP;

 #endif
 
 #endif
 

-    if (!useToolBook)
-        dialog->CreateButtons(flags);
+    // If using a toolbook, also follow Mac style and don't create buttons
+#if !wxRICHTEXT_USE_TOOLBOOK
+    dialog->CreateButtons(flags);
+#endif

 
     return true;
 }
 
     return true;
 }


@@ -338,8 +379,8 @@ class wxRichTextFormattingDialogModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxRichTextFormattingDialogModule)
 public:
     wxRichTextFormattingDialogModule() {}
 DECLARE_DYNAMIC_CLASS(wxRichTextFormattingDialogModule)
 public:
     wxRichTextFormattingDialogModule() {}

-    bool OnInit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; };
-    void OnExit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); };
+    bool OnInit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; }
+    void OnExit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextFormattingDialogModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextFormattingDialogModule, wxModule)


@@ -363,9 +404,11 @@ void wxRichTextFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         dc.SetFont(font);
         // Calculate vertical and horizontal centre
     {
         dc.SetFont(font);
         // Calculate vertical and horizontal centre

-        long w = 0, h = 0;
+        wxCoord w = 0, h = 0;

 
         wxString text(_("ABCDEFGabcdefg12345"));
 
         wxString text(_("ABCDEFGabcdefg12345"));

+        if (GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)
+            text.MakeUpper();

 
         dc.GetTextExtent( text, &w, &h);
         int cx = wxMax(2, (size.x/2) - (w/2));
 
         dc.GetTextExtent( text, &w, &h);
         int cx = wxMax(2, (size.x/2) - (w/2));


@@ -374,6 +417,13 @@ void wxRichTextFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.SetTextForeground(GetForegroundColour());
         dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
         dc.DrawText(text, cx, cy);
         dc.SetTextForeground(GetForegroundColour());
         dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
         dc.DrawText(text, cx, cy);

+
+        if (GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)
+        {
+            dc.SetPen(wxPen(GetForegroundColour(), 1));
+            dc.DrawLine(cx, (int) (cy + h/2 + 0.5), cx + w, (int) (cy + h/2 + 0.5));
+        }
+

         dc.DestroyClippingRegion();
     }
 }
         dc.DestroyClippingRegion();
     }
 }


@@ -519,9 +569,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();