removed stray return from SetFont()

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

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index 3fed169c733d4aa45754f85bd19b08c313a573bd..018bbb77605fc37086d99412c1b90337907dc8f9 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,22 +45,37 @@
 #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

 
 

-#ifdef __WXMAC__
+#if 0 // def __WXMAC__

 #define wxRICHTEXT_USE_TOOLBOOK true
 #else
 #define wxRICHTEXT_USE_TOOLBOOK false
 #endif
 
 #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)
 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;
 END_EVENT_TABLE()
 
 wxRichTextFormattingDialogFactory* wxRichTextFormattingDialog::ms_FormattingDialogFactory = NULL;


@@ -167,7 +181,7 @@ bool wxRichTextFormattingDialog::UpdateDisplay()
 
 /// Apply the styles when a different tab is selected, so the previews are
 /// up to date
 
 /// 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())
     {
 {
     if (GetBookCtrl() != event.GetEventObject())
     {


@@ -192,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)
 void wxRichTextFormattingDialog::SetFormattingDialogFactory(wxRichTextFormattingDialogFactory* factory)
 {
     if (ms_FormattingDialogFactory)


@@ -211,6 +237,7 @@ bool wxRichTextFormattingDialogFactory::CreatePages(long pages, wxRichTextFormat
 
     int availablePageCount = GetPageIdCount();
     int i;
 
     int availablePageCount = GetPageIdCount();
     int i;

+    bool selected = false;

     for (i = 0; i < availablePageCount; i ++)
     {
         int pageId = GetPageId(i);
     for (i = 0; i < availablePageCount; i ++)
     {
         int pageId = GetPageId(i);


@@ -222,10 +249,14 @@ bool wxRichTextFormattingDialogFactory::CreatePages(long pages, wxRichTextFormat
             if (panel)
             {
                 int imageIndex = GetPageImage(pageId);
             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;
 }
 
     return true;
 }
 


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


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


@@ -285,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


@@ -317,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)


@@ -363,6 +408,8 @@ void wxRichTextFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         long w = 0, h = 0;
 
         wxString text(_("ABCDEFGabcdefg12345"));
         long w = 0, h = 0;
 
         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));


@@ -371,6 +418,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();
     }
 }


@@ -438,6 +492,7 @@ void wxRichTextColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
         wxColourData data;
         data.SetChooseFull(true);
         data.SetColour(m_colour);
         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__
         wxColourDialog *dialog = new wxColourDialog(parent, &data);
         // Crashes on wxMac (no m_peer)
 #ifndef __WXMAC__


@@ -450,6 +505,7 @@ void wxRichTextColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
             SetBackgroundColour(m_colour);
         }
         dialog->Destroy();
             SetBackgroundColour(m_colour);
         }
         dialog->Destroy();

+#endif // wxUSE_COLOURDLG

         Refresh();
 
         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
         Refresh();
 
         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());


@@ -514,9 +570,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();
 


@@ -575,4 +629,3 @@ wxString wxRichTextFontListBox::CreateHTML(const wxString& facename) const
 
 #endif
     // wxUSE_RICHTEXT
 
 #endif
     // wxUSE_RICHTEXT

-