#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/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
#if 0 // def __WXMAC__
-#define wxRICHTEXT_USE_TOOLBOOK true
+#define wxRICHTEXT_USE_TOOLBOOK 1
#else
-#define wxRICHTEXT_USE_TOOLBOOK false
+#define wxRICHTEXT_USE_TOOLBOOK 0
#endif
+bool wxRichTextFormattingDialog::sm_showToolTips = false;
+
IMPLEMENT_CLASS(wxRichTextFormattingDialog, wxPropertySheetDialog)
BEGIN_EVENT_TABLE(wxRichTextFormattingDialog, wxPropertySheetDialog)
}
/// Set the attributes and optionally update the display
-bool wxRichTextFormattingDialog::SetStyle(const wxTextAttrEx& style, bool update)
+bool wxRichTextFormattingDialog::SetStyle(const wxTextAttr& style, bool update)
{
m_attributes = style;
if (update)
}
}
+/// 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)
int imageIndex = GetPageImage(pageId);
dialog->GetBookCtrl()->AddPage(panel, title, !selected, imageIndex);
selected = true;
+
+ dialog->AddPageId(pageId);
}
}
}
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;
}
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];
/// 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
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__
- sheetStyle |= wxPROPSHEET_BUTTONTOOLBOOK;
+ sheetStyle |= wxPROPSHEET_BUTTONTOOLBOOK;
#else
- sheetStyle |= wxPROPSHEET_TOOLBOOK;
+ sheetStyle |= wxPROPSHEET_TOOLBOOK;
#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;
}
/// 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__
- flags |= wxHELP;
+ if (dialog->GetWindowStyleFlag() & wxRICHTEXT_FORMAT_HELP_BUTTON)
+ flags |= wxHELP;
#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;
}
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)
EVT_PAINT(wxRichTextFontPreviewCtrl::OnPaint)
END_EVENT_TABLE()
+wxRichTextFontPreviewCtrl::wxRichTextFontPreviewCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& sz, long style)
+{
+ if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
+ style |= wxBORDER_THEME;
+
+ wxWindow::Create(parent, id, pos, sz, style);
+
+ SetBackgroundColour(*wxWHITE);
+ m_textEffects = 0;
+}
+
void wxRichTextFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
{
dc.SetFont(font);
// Calculate vertical and horizontal centre
- long w = 0, h = 0;
+ wxCoord 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.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();
}
}
// Helper for pages to get the attributes
-wxTextAttrEx* wxRichTextFormattingDialog::GetDialogAttributes(wxWindow* win)
+wxTextAttr* wxRichTextFormattingDialog::GetDialogAttributes(wxWindow* win)
{
wxRichTextFormattingDialog* dialog = GetDialog(win);
if (dialog)
IMPLEMENT_CLASS(wxRichTextColourSwatchCtrl, wxControl)
-wxRichTextColourSwatchCtrl::wxRichTextColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
- wxControl(parent, id, pos, size, style)
+wxRichTextColourSwatchCtrl::wxRichTextColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
{
+ if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
+ style |= wxBORDER_THEME;
+
+ wxControl::Create(parent, id, pos, size, style);
+
SetColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetBackgroundStyle(wxBG_STYLE_COLOUR);
}
wxColourDialog *dialog = new wxColourDialog(parent, &data);
// Crashes on wxMac (no m_peer)
#ifndef __WXMAC__
- dialog->SetTitle(_("Background colour"));
+ dialog->SetTitle(_("Colour"));
#endif
if (dialog->ShowModal() == wxID_OK)
{
bool wxRichTextFontListBox::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, long style)
{
+ if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
+ style |= wxBORDER_THEME;
+
return wxHtmlListBox::Create(parent, id, pos, size, style);
}
/// 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();
projects / wxWidgets.git / blobdiff