X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50f65288b1760ffdfd0c274b7be6b2d09e558f58..a8e87569b7ea3494ef29ac9caa6cb7f219329c50:/samples/richtext/richtext.cpp diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp index 9577212f44..168a2046f9 100644 --- a/samples/richtext/richtext.cpp +++ b/samples/richtext/richtext.cpp @@ -166,6 +166,8 @@ public: void OnDemoteList(wxCommandEvent& event); void OnClearList(wxCommandEvent& event); + void OnReload(wxCommandEvent& event); + void OnViewHTML(wxCommandEvent& event); void OnSwitchStyleSheets(wxCommandEvent& event); @@ -179,9 +181,14 @@ public: void OnPreview(wxCommandEvent& event); void OnPageSetup(wxCommandEvent& event); +protected: + // Forward command events to the current rich text control, if any bool ProcessEvent(wxEvent& event); + // Write text + void WriteInitialText(); + private: // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() @@ -207,6 +214,8 @@ enum ID_FORMAT_PARAGRAPH, ID_FORMAT_CONTENT, + ID_RELOAD, + ID_INSERT_SYMBOL, ID_INSERT_URL, @@ -292,6 +301,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_FORMAT_PARAGRAPH_SPACING_MORE, MyFrame::OnParagraphSpacingMore) EVT_MENU(ID_FORMAT_PARAGRAPH_SPACING_LESS, MyFrame::OnParagraphSpacingLess) + EVT_MENU(ID_RELOAD, MyFrame::OnReload) + EVT_MENU(ID_INSERT_SYMBOL, MyFrame::OnInsertSymbol) EVT_MENU(ID_INSERT_URL, MyFrame::OnInsertURL) @@ -333,6 +344,9 @@ IMPLEMENT_APP(MyApp) // 'Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + #if wxUSE_HELP wxHelpProvider::Set(new wxSimpleHelpProvider); #endif @@ -367,7 +381,7 @@ bool MyApp::OnInit() #endif // create the main application window - MyFrame *frame = new MyFrame(_T("wxRichTextCtrl Sample"), wxID_ANY, wxDefaultPosition, wxSize(700, 600)); + MyFrame *frame = new MyFrame(wxT("wxRichTextCtrl Sample"), wxID_ANY, wxDefaultPosition, wxSize(700, 600)); m_printing->SetParentWindow(frame); @@ -423,7 +437,7 @@ void MyApp::CreateStyles() wxRichTextAttr indentedAttr2; indentedAttr2.SetFontFaceName(romanFont.GetFaceName()); indentedAttr2.SetFontSize(12); - indentedAttr2.SetFontWeight(wxBOLD); + indentedAttr2.SetFontWeight(wxFONTWEIGHT_BOLD); indentedAttr2.SetTextColour(*wxRED); indentedAttr2.SetFontSize(12); indentedAttr2.SetLeftIndent(100, 0); @@ -450,7 +464,7 @@ void MyApp::CreateStyles() wxRichTextAttr boldAttr; boldAttr.SetFontFaceName(romanFont.GetFaceName()); boldAttr.SetFontSize(12); - boldAttr.SetFontWeight(wxBOLD); + boldAttr.SetFontWeight(wxFONTWEIGHT_BOLD); // We only want to affect boldness boldAttr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT); boldDef->SetStyle(boldAttr); @@ -461,7 +475,7 @@ void MyApp::CreateStyles() wxRichTextAttr italicAttr; italicAttr.SetFontFaceName(romanFont.GetFaceName()); italicAttr.SetFontSize(12); - italicAttr.SetFontStyle(wxITALIC); + italicAttr.SetFontStyle(wxFONTSTYLE_ITALIC); // We only want to affect italics italicAttr.SetFlags(wxTEXT_ATTR_FONT_ITALIC); italicDef->SetStyle(italicAttr); @@ -472,7 +486,7 @@ void MyApp::CreateStyles() wxRichTextAttr redAttr; redAttr.SetFontFaceName(romanFont.GetFaceName()); redAttr.SetFontSize(12); - redAttr.SetFontWeight(wxBOLD); + redAttr.SetFontWeight(wxFONTWEIGHT_BOLD); redAttr.SetTextColour(*wxRED); // We only want to affect colour, weight and face redAttr.SetFlags(wxTEXT_ATTR_FONT_FACE|wxTEXT_ATTR_FONT_WEIGHT|wxTEXT_ATTR_TEXT_COLOUR); @@ -555,19 +569,21 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, // the "About" item should be in the help menu wxMenu *helpMenu = new wxMenu; - helpMenu->Append(ID_About, _T("&About...\tF1"), _T("Show about dialog")); + helpMenu->Append(ID_About, wxT("&About...\tF1"), wxT("Show about dialog")); - fileMenu->Append(wxID_OPEN, _T("&Open\tCtrl+O"), _T("Open a file")); - fileMenu->Append(wxID_SAVE, _T("&Save\tCtrl+S"), _T("Save a file")); - fileMenu->Append(wxID_SAVEAS, _T("&Save As...\tF12"), _T("Save to a new file")); + fileMenu->Append(wxID_OPEN, wxT("&Open\tCtrl+O"), wxT("Open a file")); + fileMenu->Append(wxID_SAVE, wxT("&Save\tCtrl+S"), wxT("Save a file")); + fileMenu->Append(wxID_SAVEAS, wxT("&Save As...\tF12"), wxT("Save to a new file")); fileMenu->AppendSeparator(); - fileMenu->Append(ID_PAGE_SETUP, _T("Page Set&up..."), _T("Page setup")); - fileMenu->Append(ID_PRINT, _T("&Print...\tCtrl+P"), _T("Print")); - fileMenu->Append(ID_PREVIEW, _T("Print Pre&view"), _T("Print preview")); + fileMenu->Append(ID_RELOAD, wxT("&Reload Text\tF2"), wxT("Reload the initial text")); fileMenu->AppendSeparator(); - fileMenu->Append(ID_VIEW_HTML, _T("&View as HTML"), _T("View HTML")); + fileMenu->Append(ID_PAGE_SETUP, wxT("Page Set&up..."), wxT("Page setup")); + fileMenu->Append(ID_PRINT, wxT("&Print...\tCtrl+P"), wxT("Print")); + fileMenu->Append(ID_PREVIEW, wxT("Print Pre&view"), wxT("Print preview")); fileMenu->AppendSeparator(); - fileMenu->Append(ID_Quit, _T("E&xit\tAlt+X"), _T("Quit this program")); + fileMenu->Append(ID_VIEW_HTML, wxT("&View as HTML"), wxT("View HTML")); + fileMenu->AppendSeparator(); + fileMenu->Append(ID_Quit, wxT("E&xit\tAlt+X"), wxT("Quit this program")); wxMenu* editMenu = new wxMenu; editMenu->Append(wxID_UNDO, _("&Undo\tCtrl+Z")); @@ -627,12 +643,12 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar(); - menuBar->Append(fileMenu, _T("&File")); - menuBar->Append(editMenu, _T("&Edit")); - menuBar->Append(formatMenu, _T("F&ormat")); - menuBar->Append(listsMenu, _T("&Lists")); - menuBar->Append(insertMenu, _T("&Insert")); - menuBar->Append(helpMenu, _T("&Help")); + menuBar->Append(fileMenu, wxT("&File")); + menuBar->Append(editMenu, wxT("&Edit")); + menuBar->Append(formatMenu, wxT("F&ormat")); + menuBar->Append(listsMenu, wxT("&Lists")); + menuBar->Append(insertMenu, wxT("&Insert")); + menuBar->Append(helpMenu, wxT("&Help")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); @@ -645,47 +661,47 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, if ( !is_pda ) { CreateStatusBar(2); - SetStatusText(_T("Welcome to wxRichTextCtrl!")); + SetStatusText(wxT("Welcome to wxRichTextCtrl!")); } #endif wxToolBar* toolBar = CreateToolBar(); - toolBar->AddTool(wxID_OPEN, wxBitmap(open_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Open")); - toolBar->AddTool(wxID_SAVEAS, wxBitmap(save_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Save")); + toolBar->AddTool(wxID_OPEN, wxEmptyString, wxBitmap(open_xpm), _("Open")); + toolBar->AddTool(wxID_SAVEAS, wxEmptyString, wxBitmap(save_xpm), _("Save")); toolBar->AddSeparator(); - toolBar->AddTool(wxID_CUT, wxBitmap(cut_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Cut")); - toolBar->AddTool(wxID_COPY, wxBitmap(copy_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Copy")); - toolBar->AddTool(wxID_PASTE, wxBitmap(paste_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Paste")); + toolBar->AddTool(wxID_CUT, wxEmptyString, wxBitmap(cut_xpm), _("Cut")); + toolBar->AddTool(wxID_COPY, wxEmptyString, wxBitmap(copy_xpm), _("Copy")); + toolBar->AddTool(wxID_PASTE, wxEmptyString, wxBitmap(paste_xpm), _("Paste")); toolBar->AddSeparator(); - toolBar->AddTool(wxID_UNDO, wxBitmap(undo_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Undo")); - toolBar->AddTool(wxID_REDO, wxBitmap(redo_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Redo")); + toolBar->AddTool(wxID_UNDO, wxEmptyString, wxBitmap(undo_xpm), _("Undo")); + toolBar->AddTool(wxID_REDO, wxEmptyString, wxBitmap(redo_xpm), _("Redo")); toolBar->AddSeparator(); - toolBar->AddTool(ID_FORMAT_BOLD, wxBitmap(bold_xpm), wxNullBitmap, true, -1, -1, (wxObject *) NULL, _("Bold")); - toolBar->AddTool(ID_FORMAT_ITALIC, wxBitmap(italic_xpm), wxNullBitmap, true, -1, -1, (wxObject *) NULL, _("Italic")); - toolBar->AddTool(ID_FORMAT_UNDERLINE, wxBitmap(underline_xpm), wxNullBitmap, true, -1, -1, (wxObject *) NULL, _("Underline")); + toolBar->AddCheckTool(ID_FORMAT_BOLD, wxEmptyString, wxBitmap(bold_xpm), wxNullBitmap, _("Bold")); + toolBar->AddCheckTool(ID_FORMAT_ITALIC, wxEmptyString, wxBitmap(italic_xpm), wxNullBitmap, _("Italic")); + toolBar->AddCheckTool(ID_FORMAT_UNDERLINE, wxEmptyString, wxBitmap(underline_xpm), wxNullBitmap, _("Underline")); toolBar->AddSeparator(); - toolBar->AddTool(ID_FORMAT_ALIGN_LEFT, wxBitmap(alignleft_xpm), wxNullBitmap, true, -1, -1, (wxObject *) NULL, _("Align Left")); - toolBar->AddTool(ID_FORMAT_ALIGN_CENTRE, wxBitmap(centre_xpm), wxNullBitmap, true, -1, -1, (wxObject *) NULL, _("Centre")); - toolBar->AddTool(ID_FORMAT_ALIGN_RIGHT, wxBitmap(alignright_xpm), wxNullBitmap, true, -1, -1, (wxObject *) NULL, _("Align Right")); + toolBar->AddCheckTool(ID_FORMAT_ALIGN_LEFT, wxEmptyString, wxBitmap(alignleft_xpm), wxNullBitmap, _("Align Left")); + toolBar->AddCheckTool(ID_FORMAT_ALIGN_CENTRE, wxEmptyString, wxBitmap(centre_xpm), wxNullBitmap, _("Centre")); + toolBar->AddCheckTool(ID_FORMAT_ALIGN_RIGHT, wxEmptyString, wxBitmap(alignright_xpm), wxNullBitmap, _("Align Right")); toolBar->AddSeparator(); - toolBar->AddTool(ID_FORMAT_INDENT_LESS, wxBitmap(indentless_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Indent Less")); - toolBar->AddTool(ID_FORMAT_INDENT_MORE, wxBitmap(indentmore_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Indent More")); + toolBar->AddTool(ID_FORMAT_INDENT_LESS, wxEmptyString, wxBitmap(indentless_xpm), _("Indent Less")); + toolBar->AddTool(ID_FORMAT_INDENT_MORE, wxEmptyString, wxBitmap(indentmore_xpm), _("Indent More")); toolBar->AddSeparator(); - toolBar->AddTool(ID_FORMAT_FONT, wxBitmap(font_xpm), wxNullBitmap, false, -1, -1, (wxObject *) NULL, _("Font")); + toolBar->AddTool(ID_FORMAT_FONT, wxEmptyString, wxBitmap(font_xpm), _("Font")); wxRichTextStyleComboCtrl* combo = new wxRichTextStyleComboCtrl(toolBar, ID_RICHTEXT_STYLE_COMBO, wxDefaultPosition, wxSize(200, -1)); toolBar->AddControl(combo); toolBar->Realize(); - wxSplitterWindow* splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, GetClientSize(), wxSP_NO_XP_THEME|wxSP_3D|wxSP_LIVE_UPDATE); + wxSplitterWindow* splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, GetClientSize(), wxSP_LIVE_UPDATE); wxFont textFont = wxFont(12, wxROMAN, wxNORMAL, wxNORMAL); wxFont boldFont = wxFont(12, wxROMAN, wxNORMAL, wxBOLD); wxFont italicFont = wxFont(12, wxROMAN, wxITALIC, wxNORMAL); - m_richTextCtrl = new wxRichTextCtrl(splitter, ID_RICHTEXT_CTRL, wxEmptyString, wxDefaultPosition, wxSize(200, 200), wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS); + m_richTextCtrl = new wxRichTextCtrl(splitter, ID_RICHTEXT_CTRL, wxEmptyString, wxDefaultPosition, wxSize(200, 200), wxVSCROLL|wxHSCROLL|wxWANTS_CHARS); wxFont font(12, wxROMAN, wxNORMAL, wxNORMAL); m_richTextCtrl->SetFont(font); @@ -714,8 +730,16 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, styleListCtrl->SetRichTextCtrl(m_richTextCtrl); styleListCtrl->UpdateStyles(); + WriteInitialText(); +} + +// Write text +void MyFrame::WriteInitialText() +{ wxRichTextCtrl& r = *m_richTextCtrl; + r.SetDefaultStyle(wxRichTextAttr()); + r.BeginSuppressUndo(); r.BeginParagraphSpacing(0, 20); @@ -724,12 +748,11 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, r.BeginBold(); r.BeginFontSize(14); - + wxString lineBreak = (wxChar) 29; - - r.WriteText(wxString(wxT("Welcome to wxRichTextCtrl, a wxWidgets control")) + lineBreak + wxT("for editing and presenting styled text and images")); + + r.WriteText(wxString(wxT("Welcome to wxRichTextCtrl, a wxWidgets control")) + lineBreak + wxT("for editing and presenting styled text and images\n")); r.EndFontSize(); - r.Newline(); r.BeginItalic(); r.WriteText(wxT("by Julian Smart")); @@ -740,11 +763,11 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, r.WriteImage(wxBitmap(zebra_xpm)); - r.EndAlignment(); - r.Newline(); r.Newline(); + r.EndAlignment(); + r.WriteText(wxT("What can you do with this thing? ")); r.WriteImage(wxBitmap(smiley_xpm)); @@ -754,9 +777,12 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, r.WriteText(wxT("colour, like this red bit.")); r.EndTextColour(); - r.BeginTextColour(wxColour(0, 0, 255)); - r.WriteText(wxT(" And this blue bit.")); - r.EndTextColour(); + wxRichTextAttr backgroundColourAttr; + backgroundColourAttr.SetBackgroundColour(*wxGREEN); + backgroundColourAttr.SetTextColour(wxColour(0, 0, 255)); + r.BeginStyle(backgroundColourAttr); + r.WriteText(wxT(" And this blue on green bit.")); + r.EndStyle(); r.WriteText(wxT(" Naturally you can make things ")); r.BeginBold(); @@ -775,57 +801,55 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, r.WriteText(wxT(" Next we'll show an indented paragraph.")); - r.BeginLeftIndent(60); r.Newline(); + r.BeginLeftIndent(60); r.WriteText(wxT("It was in January, the most down-trodden month of an Edinburgh winter. An attractive woman came into the cafe, which is nothing remarkable.")); - r.EndLeftIndent(); - r.Newline(); + r.EndLeftIndent(); + r.WriteText(wxT("Next, we'll show a first-line indent, achieved using BeginLeftIndent(100, -40).")); - r.BeginLeftIndent(100, -40); r.Newline(); - r.WriteText(wxT("It was in January, the most down-trodden month of an Edinburgh winter. An attractive woman came into the cafe, which is nothing remarkable.")); - r.EndLeftIndent(); + r.BeginLeftIndent(100, -40); + r.WriteText(wxT("It was in January, the most down-trodden month of an Edinburgh winter. An attractive woman came into the cafe, which is nothing remarkable.")); r.Newline(); - r.WriteText(wxT("Numbered bullets are possible, again using subindents:")); + r.EndLeftIndent(); - r.BeginNumberedBullet(1, 100, 60); + r.WriteText(wxT("Numbered bullets are possible, again using subindents:")); r.Newline(); + r.BeginNumberedBullet(1, 100, 60); r.WriteText(wxT("This is my first item. Note that wxRichTextCtrl can apply numbering and bullets automatically based on list styles, but this list is formatted explicitly by setting indents.")); + r.Newline(); r.EndNumberedBullet(); r.BeginNumberedBullet(2, 100, 60); - r.Newline(); - r.WriteText(wxT("This is my second item.")); - r.EndNumberedBullet(); - r.Newline(); + r.EndNumberedBullet(); r.WriteText(wxT("The following paragraph is right-indented:")); + r.Newline(); r.BeginRightIndent(200); - r.Newline(); r.WriteText(wxT("It was in January, the most down-trodden month of an Edinburgh winter. An attractive woman came into the cafe, which is nothing remarkable.")); - r.EndRightIndent(); - r.Newline(); + r.EndRightIndent(); + r.WriteText(wxT("The following paragraph is right-aligned with 1.5 line spacing:")); + r.Newline(); r.BeginAlignment(wxTEXT_ALIGNMENT_RIGHT); r.BeginLineSpacing(wxTEXT_ATTR_LINE_SPACING_HALF); - r.Newline(); - r.WriteText(wxT("It was in January, the most down-trodden month of an Edinburgh winter. An attractive woman came into the cafe, which is nothing remarkable.")); + r.Newline(); r.EndLineSpacing(); r.EndAlignment(); @@ -839,48 +863,46 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, attr.SetTabs(tabs); r.SetDefaultStyle(attr); - r.Newline(); r.WriteText(wxT("This line contains tabs:\tFirst tab\tSecond tab\tThird tab")); - r.Newline(); + r.WriteText(wxT("Other notable features of wxRichTextCtrl include:")); + r.Newline(); r.BeginSymbolBullet(wxT('*'), 100, 60); - r.Newline(); r.WriteText(wxT("Compatibility with wxTextCtrl API")); + r.Newline(); r.EndSymbolBullet(); r.BeginSymbolBullet(wxT('*'), 100, 60); - r.Newline(); r.WriteText(wxT("Easy stack-based BeginXXX()...EndXXX() style setting in addition to SetStyle()")); + r.Newline(); r.EndSymbolBullet(); r.BeginSymbolBullet(wxT('*'), 100, 60); - r.Newline(); r.WriteText(wxT("XML loading and saving")); + r.Newline(); r.EndSymbolBullet(); r.BeginSymbolBullet(wxT('*'), 100, 60); - r.Newline(); r.WriteText(wxT("Undo/Redo, with batching option and Undo suppressing")); + r.Newline(); r.EndSymbolBullet(); r.BeginSymbolBullet(wxT('*'), 100, 60); - r.Newline(); r.WriteText(wxT("Clipboard copy and paste")); + r.Newline(); r.EndSymbolBullet(); r.BeginSymbolBullet(wxT('*'), 100, 60); - r.Newline(); r.WriteText(wxT("wxRichTextStyleSheet with named character and paragraph styles, and control for applying named styles")); + r.Newline(); r.EndSymbolBullet(); r.BeginSymbolBullet(wxT('*'), 100, 60); - r.Newline(); r.WriteText(wxT("A design that can easily be extended to other content types, ultimately with text boxes, tables, controls, and so on")); - r.EndSymbolBullet(); - r.Newline(); + r.EndSymbolBullet(); // Make a style suitable for showing a URL wxRichTextAttr urlStyle; @@ -897,14 +919,13 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, r.Newline(); - r.WriteText(wxT("Note: this sample content was generated programmatically from within the MyFrame constructor in the demo. The images were loaded from inline XPMs. Enjoy wxRichTextCtrl!")); + r.WriteText(wxT("Note: this sample content was generated programmatically from within the MyFrame constructor in the demo. The images were loaded from inline XPMs. Enjoy wxRichTextCtrl!\n")); r.EndParagraphSpacing(); r.EndSuppressUndo(); } - // event handlers void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) @@ -916,8 +937,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg; - msg.Printf( _T("This is a demo for wxRichTextCtrl, a control for editing styled text.\n(c) Julian Smart, 2005")); - wxMessageBox(msg, _T("About wxRichTextCtrl Sample"), wxOK | wxICON_INFORMATION, this); + msg.Printf( wxT("This is a demo for wxRichTextCtrl, a control for editing styled text.\n(c) Julian Smart, 2005")); + wxMessageBox(msg, wxT("About wxRichTextCtrl Sample"), wxOK | wxICON_INFORMATION, this); } // Forward command events to the current rich text control, if any @@ -939,7 +960,7 @@ bool MyFrame::ProcessEvent(wxEvent& event) s_id = event.GetId(); wxWindow* focusWin = wxFindFocusDescendant(this); - if (focusWin && focusWin->ProcessEvent(event)) + if (focusWin && focusWin->GetEventHandler()->ProcessEvent(event)) { //s_command = NULL; s_eventType = 0; @@ -1178,7 +1199,7 @@ void MyFrame::OnUpdateFormat(wxUpdateUIEvent& event) void MyFrame::OnIndentMore(wxCommandEvent& WXUNUSED(event)) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT); if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr)) @@ -1187,7 +1208,6 @@ void MyFrame::OnIndentMore(wxCommandEvent& WXUNUSED(event)) if (m_richTextCtrl->HasSelection()) range = m_richTextCtrl->GetSelectionRange(); - wxFontData fontData; attr.SetLeftIndent(attr.GetLeftIndent() + 100); attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT); @@ -1197,7 +1217,7 @@ void MyFrame::OnIndentMore(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnIndentLess(wxCommandEvent& WXUNUSED(event)) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT); if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr)) @@ -1206,10 +1226,9 @@ void MyFrame::OnIndentLess(wxCommandEvent& WXUNUSED(event)) if (m_richTextCtrl->HasSelection()) range = m_richTextCtrl->GetSelectionRange(); - if (attr.GetLeftIndent() >= 100) + if (attr.GetLeftIndent() > 0) { - wxFontData fontData; - attr.SetLeftIndent(attr.GetLeftIndent() - 100); + attr.SetLeftIndent(wxMax(0, attr.GetLeftIndent() - 100)); m_richTextCtrl->SetStyle(range, attr); } @@ -1218,7 +1237,7 @@ void MyFrame::OnIndentLess(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnLineSpacingHalf(wxCommandEvent& WXUNUSED(event)) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr)) @@ -1227,7 +1246,6 @@ void MyFrame::OnLineSpacingHalf(wxCommandEvent& WXUNUSED(event)) if (m_richTextCtrl->HasSelection()) range = m_richTextCtrl->GetSelectionRange(); - wxFontData fontData; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); attr.SetLineSpacing(15); @@ -1237,7 +1255,7 @@ void MyFrame::OnLineSpacingHalf(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnLineSpacingDouble(wxCommandEvent& WXUNUSED(event)) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr)) @@ -1246,7 +1264,6 @@ void MyFrame::OnLineSpacingDouble(wxCommandEvent& WXUNUSED(event)) if (m_richTextCtrl->HasSelection()) range = m_richTextCtrl->GetSelectionRange(); - wxFontData fontData; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); attr.SetLineSpacing(20); @@ -1256,7 +1273,7 @@ void MyFrame::OnLineSpacingDouble(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnLineSpacingSingle(wxCommandEvent& WXUNUSED(event)) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr)) @@ -1265,7 +1282,6 @@ void MyFrame::OnLineSpacingSingle(wxCommandEvent& WXUNUSED(event)) if (m_richTextCtrl->HasSelection()) range = m_richTextCtrl->GetSelectionRange(); - wxFontData fontData; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); attr.SetLineSpacing(0); // Can also use 10 @@ -1275,7 +1291,7 @@ void MyFrame::OnLineSpacingSingle(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnParagraphSpacingMore(wxCommandEvent& WXUNUSED(event)) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER); if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr)) @@ -1284,7 +1300,6 @@ void MyFrame::OnParagraphSpacingMore(wxCommandEvent& WXUNUSED(event)) if (m_richTextCtrl->HasSelection()) range = m_richTextCtrl->GetSelectionRange(); - wxFontData fontData; attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() + 20); attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER); @@ -1294,7 +1309,7 @@ void MyFrame::OnParagraphSpacingMore(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnParagraphSpacingLess(wxCommandEvent& WXUNUSED(event)) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER); if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr)) @@ -1305,7 +1320,6 @@ void MyFrame::OnParagraphSpacingLess(wxCommandEvent& WXUNUSED(event)) if (attr.GetParagraphSpacingAfter() >= 20) { - wxFontData fontData; attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() - 20); attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER); @@ -1314,6 +1328,12 @@ void MyFrame::OnParagraphSpacingLess(wxCommandEvent& WXUNUSED(event)) } } +void MyFrame::OnReload(wxCommandEvent& WXUNUSED(event)) +{ + m_richTextCtrl->Clear(); + WriteInitialText(); +} + void MyFrame::OnViewHTML(wxCommandEvent& WXUNUSED(event)) { wxDialog dialog(this, wxID_ANY, _("HTML"), wxDefaultPosition, wxSize(500, 400), wxDEFAULT_DIALOG_STYLE); @@ -1332,7 +1352,7 @@ void MyFrame::OnViewHTML(wxCommandEvent& WXUNUSED(event)) wxRichTextHTMLHandler htmlHandler; htmlHandler.SetFlags(wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY); - + wxArrayInt fontSizeMapping; fontSizeMapping.Add(7); fontSizeMapping.Add(9); @@ -1341,7 +1361,7 @@ void MyFrame::OnViewHTML(wxCommandEvent& WXUNUSED(event)) fontSizeMapping.Add(14); fontSizeMapping.Add(22); fontSizeMapping.Add(100); - + htmlHandler.SetFontSizeMapping(fontSizeMapping); if (htmlHandler.SaveFile(& m_richTextCtrl->GetBuffer(), strStream)) @@ -1423,7 +1443,7 @@ void MyFrame::OnManageStyles(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event)) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT); m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr); @@ -1533,7 +1553,7 @@ void MyFrame::OnInsertURL(wxCommandEvent& WXUNUSED(event)) wxRichTextAttr urlStyle; urlStyle.SetTextColour(*wxBLUE); urlStyle.SetFontUnderlined(true); - + m_richTextCtrl->BeginStyle(urlStyle); m_richTextCtrl->BeginURL(url); m_richTextCtrl->WriteText(url);