wxCairoContext doesn't need to know about wxPizza

[wxWidgets.git] / samples / richtext / richtext.cpp

diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index c0f12931b9db7fe20ad9f6a47659e5b9df8801b2..23e50e2563e5538e70c827cb634934e27412061e 100644 (file)
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -35,6 +35,11 @@
 #include "wx/sstream.h"
 #include "wx/html/htmlwin.h"
 
 #include "wx/sstream.h"
 #include "wx/html/htmlwin.h"
 

+#if wxUSE_FILESYSTEM
+#include "wx/filesys.h"
+#include "wx/fs_mem.h"
+#endif
+

 #if wxUSE_HELP
 #include "wx/cshelp.h"
 #endif
 #if wxUSE_HELP
 #include "wx/cshelp.h"
 #endif


@@ -72,6 +77,7 @@
 #include "wx/richtext/richtextformatdlg.h"
 #include "wx/richtext/richtextsymboldlg.h"
 #include "wx/richtext/richtextstyledlg.h"
 #include "wx/richtext/richtextformatdlg.h"
 #include "wx/richtext/richtextsymboldlg.h"
 #include "wx/richtext/richtextstyledlg.h"

+#include "wx/richtext/richtextprint.h"

 
 // ----------------------------------------------------------------------------
 // resources
 
 // ----------------------------------------------------------------------------
 // resources


@@ -97,8 +103,10 @@ public:
     void CreateStyles();
 
     wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; }
     void CreateStyles();
 
     wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; }

+    wxRichTextPrinting* GetPrinting() const { return m_printing; }

 
 

-    wxRichTextStyleSheet* m_styleSheet;
+    wxRichTextStyleSheet*   m_styleSheet;
+    wxRichTextPrinting*     m_printing;

 };
 
 // Define a new frame type: this is going to be our main frame
 };
 
 // Define a new frame type: this is going to be our main frame


@@ -163,6 +171,14 @@ public:
     void OnSwitchStyleSheets(wxCommandEvent& event);
     void OnManageStyles(wxCommandEvent& event);
 
     void OnSwitchStyleSheets(wxCommandEvent& event);
     void OnManageStyles(wxCommandEvent& event);
 

+    void OnInsertURL(wxCommandEvent& event);
+    void OnURL(wxTextUrlEvent& event);
+    void OnStyleSheetReplacing(wxRichTextEvent& event);
+
+    void OnPrint(wxCommandEvent& event);
+    void OnPreview(wxCommandEvent& event);
+    void OnPageSetup(wxCommandEvent& event);
+

     // Forward command events to the current rich text control, if any
     bool ProcessEvent(wxEvent& event);
 
     // Forward command events to the current rich text control, if any
     bool ProcessEvent(wxEvent& event);
 


@@ -192,6 +208,7 @@ enum
     ID_FORMAT_CONTENT,
 
     ID_INSERT_SYMBOL,
     ID_FORMAT_CONTENT,
 
     ID_INSERT_SYMBOL,

+    ID_INSERT_URL,

 
     ID_FORMAT_ALIGN_LEFT,
     ID_FORMAT_ALIGN_CENTRE,
 
     ID_FORMAT_ALIGN_LEFT,
     ID_FORMAT_ALIGN_CENTRE,


@@ -219,6 +236,10 @@ enum
     ID_SWITCH_STYLE_SHEETS,
     ID_MANAGE_STYLES,
 
     ID_SWITCH_STYLE_SHEETS,
     ID_MANAGE_STYLES,
 

+    ID_PRINT,
+    ID_PREVIEW,
+    ID_PAGE_SETUP,
+

     ID_RICHTEXT_CTRL,
     ID_RICHTEXT_STYLE_LIST,
     ID_RICHTEXT_STYLE_COMBO
     ID_RICHTEXT_CTRL,
     ID_RICHTEXT_STYLE_LIST,
     ID_RICHTEXT_STYLE_COMBO


@@ -272,6 +293,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(ID_FORMAT_PARAGRAPH_SPACING_LESS,  MyFrame::OnParagraphSpacingLess)
 
     EVT_MENU(ID_INSERT_SYMBOL,  MyFrame::OnInsertSymbol)
     EVT_MENU(ID_FORMAT_PARAGRAPH_SPACING_LESS,  MyFrame::OnParagraphSpacingLess)
 
     EVT_MENU(ID_INSERT_SYMBOL,  MyFrame::OnInsertSymbol)

+    EVT_MENU(ID_INSERT_URL,  MyFrame::OnInsertURL)

 
     EVT_MENU(ID_FORMAT_NUMBER_LIST, MyFrame::OnNumberList)
     EVT_MENU(ID_FORMAT_BULLETS_AND_NUMBERING, MyFrame::OnBulletsAndNumbering)
 
     EVT_MENU(ID_FORMAT_NUMBER_LIST, MyFrame::OnNumberList)
     EVT_MENU(ID_FORMAT_BULLETS_AND_NUMBERING, MyFrame::OnBulletsAndNumbering)


@@ -284,6 +306,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(ID_VIEW_HTML, MyFrame::OnViewHTML)
     EVT_MENU(ID_SWITCH_STYLE_SHEETS, MyFrame::OnSwitchStyleSheets)
     EVT_MENU(ID_MANAGE_STYLES, MyFrame::OnManageStyles)
     EVT_MENU(ID_VIEW_HTML, MyFrame::OnViewHTML)
     EVT_MENU(ID_SWITCH_STYLE_SHEETS, MyFrame::OnSwitchStyleSheets)
     EVT_MENU(ID_MANAGE_STYLES, MyFrame::OnManageStyles)

+
+    EVT_MENU(ID_PRINT, MyFrame::OnPrint)
+    EVT_MENU(ID_PREVIEW, MyFrame::OnPreview)
+    EVT_MENU(ID_PAGE_SETUP, MyFrame::OnPageSetup)
+
+    EVT_TEXT_URL(wxID_ANY, MyFrame::OnURL)
+    EVT_RICHTEXT_STYLESHEET_REPLACING(wxID_ANY, MyFrame::OnStyleSheetReplacing)

 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWidgets to create
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWidgets to create


@@ -304,11 +333,18 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

 #if wxUSE_HELP
     wxHelpProvider::Set(new wxSimpleHelpProvider);
 #endif
 
     m_styleSheet = new wxRichTextStyleSheet;
 #if wxUSE_HELP
     wxHelpProvider::Set(new wxSimpleHelpProvider);
 #endif
 
     m_styleSheet = new wxRichTextStyleSheet;

+    m_printing = new wxRichTextPrinting(wxT("Test Document"));
+
+    m_printing->SetFooterText(wxT("@TITLE@"), wxRICHTEXT_PAGE_ALL, wxRICHTEXT_PAGE_CENTRE);
+    m_printing->SetFooterText(wxT("Page @PAGENUM@"), wxRICHTEXT_PAGE_ALL, wxRICHTEXT_PAGE_RIGHT);

 
     CreateStyles();
 
 
     CreateStyles();
 


@@ -329,9 +365,15 @@ bool MyApp::OnInit()
     wxImage::AddHandler( new wxGIFHandler );
 #endif
 
     wxImage::AddHandler( new wxGIFHandler );
 #endif
 

+#if wxUSE_FILESYSTEM
+    wxFileSystem::AddHandler( new wxMemoryFSHandler );
+#endif
+

     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxRichTextCtrl Sample"), wxID_ANY, wxDefaultPosition, wxSize(700, 600));
 
     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxRichTextCtrl Sample"), wxID_ANY, wxDefaultPosition, wxSize(700, 600));
 

+    m_printing->SetParentWindow(frame);
+

     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
     frame->Show(true);
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
     frame->Show(true);


@@ -344,7 +386,9 @@ bool MyApp::OnInit()
 
 int MyApp::OnExit()
 {
 
 int MyApp::OnExit()
 {

+    delete m_printing;

     delete m_styleSheet;
     delete m_styleSheet;

+

     return 0;
 }
 
     return 0;
 }
 


@@ -443,19 +487,19 @@ void MyApp::CreateStyles()
     int i;
     for (i = 0; i < 10; i++)
     {
     int i;
     for (i = 0; i < 10; i++)
     {

-        wxString bulletSymbol;
+        wxString bulletText;

         if (i == 0)
         if (i == 0)

-            bulletSymbol = wxT("*");
+            bulletText = wxT("standard/circle");

         else if (i == 1)
         else if (i == 1)

-            bulletSymbol = wxT("-");
+            bulletText = wxT("standard/square");

         else if (i == 2)
         else if (i == 2)

-            bulletSymbol = wxT("*");
+            bulletText = wxT("standard/circle");

         else if (i == 3)
         else if (i == 3)

-            bulletSymbol = wxT("-");
+            bulletText = wxT("standard/square");

         else
         else

-            bulletSymbol = wxT("*");
+            bulletText = wxT("standard/circle");

 
 

-        bulletList->SetAttributes(i, (i+1)*60, 60, wxTEXT_ATTR_BULLET_STYLE_SYMBOL, bulletSymbol);
+        bulletList->SetAttributes(i, (i+1)*60, 60, wxTEXT_ATTR_BULLET_STYLE_STANDARD, bulletText);

     }
 
     m_styleSheet->AddListStyle(bulletList);
     }
 
     m_styleSheet->AddListStyle(bulletList);


@@ -475,10 +519,26 @@ void MyApp::CreateStyles()
         else
             numberStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD;
 
         else
             numberStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD;
 

+        numberStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT;
+

         numberedList->SetAttributes(i, (i+1)*60, 60, numberStyle);
     }
 
     m_styleSheet->AddListStyle(numberedList);
         numberedList->SetAttributes(i, (i+1)*60, 60, numberStyle);
     }
 
     m_styleSheet->AddListStyle(numberedList);

+
+    wxRichTextListStyleDefinition* outlineList = new wxRichTextListStyleDefinition(wxT("Outline List 1"));
+    for (i = 0; i < 10; i++)
+    {
+        long numberStyle;
+        if (i < 4)
+            numberStyle = wxTEXT_ATTR_BULLET_STYLE_OUTLINE|wxTEXT_ATTR_BULLET_STYLE_PERIOD;
+        else
+            numberStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD;
+
+        outlineList->SetAttributes(i, (i+1)*120, 120, numberStyle);
+    }
+
+    m_styleSheet->AddListStyle(outlineList);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -504,6 +564,10 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     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->AppendSeparator();
     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->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->AppendSeparator();

     fileMenu->Append(ID_VIEW_HTML, _T("&View as HTML"), _T("View HTML"));
     fileMenu->AppendSeparator();
     fileMenu->Append(ID_Quit, _T("E&xit\tAlt+X"), _T("Quit this program"));
     fileMenu->Append(ID_VIEW_HTML, _T("&View as HTML"), _T("View HTML"));
     fileMenu->AppendSeparator();
     fileMenu->Append(ID_Quit, _T("E&xit\tAlt+X"), _T("Quit this program"));


@@ -516,8 +580,6 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     editMenu->Append(wxID_COPY, _("&Copy\tCtrl+C"));
     editMenu->Append(wxID_PASTE, _("&Paste\tCtrl+V"));
 
     editMenu->Append(wxID_COPY, _("&Copy\tCtrl+C"));
     editMenu->Append(wxID_PASTE, _("&Paste\tCtrl+V"));
 

-    editMenu->Append(wxID_CLEAR, _("&Delete\tDel"));
-

     editMenu->AppendSeparator();
     editMenu->Append(wxID_SELECTALL, _("Select A&ll\tCtrl+A"));
 #if 0
     editMenu->AppendSeparator();
     editMenu->Append(wxID_SELECTALL, _("Select A&ll\tCtrl+A"));
 #if 0


@@ -564,6 +626,7 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
 
     wxMenu* insertMenu = new wxMenu;
     insertMenu->Append(ID_INSERT_SYMBOL, _("&Symbol...\tCtrl+I"));
 
     wxMenu* insertMenu = new wxMenu;
     insertMenu->Append(ID_INSERT_SYMBOL, _("&Symbol...\tCtrl+I"));

+    insertMenu->Append(ID_INSERT_URL, _("&URL..."));

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();


@@ -619,13 +682,13 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
 
     toolBar->Realize();
 
 
     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);
 
 
     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);
     wxFont font(12, wxROMAN, wxNORMAL, wxNORMAL);
 
     m_richTextCtrl->SetFont(font);


@@ -664,7 +727,10 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     r.BeginBold();
 
     r.BeginFontSize(14);
     r.BeginBold();
 
     r.BeginFontSize(14);

-    r.WriteText(wxT("Welcome to wxRichTextCtrl, a wxWidgets control for editing and presenting styled text and images"));
+
+    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.EndFontSize();
     r.Newline();
 
     r.EndFontSize();
     r.Newline();
 


@@ -673,8 +739,8 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     r.EndItalic();
 
     r.EndBold();
     r.EndItalic();
 
     r.EndBold();

-

     r.Newline();
     r.Newline();

+

     r.WriteImage(wxBitmap(zebra_xpm));
 
     r.EndAlignment();
     r.WriteImage(wxBitmap(zebra_xpm));
 
     r.EndAlignment();


@@ -683,6 +749,7 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     r.Newline();
 
     r.WriteText(wxT("What can you do with this thing? "));
     r.Newline();
 
     r.WriteText(wxT("What can you do with this thing? "));

+

     r.WriteImage(wxBitmap(smiley_xpm));
     r.WriteText(wxT(" Well, you can change text "));
 
     r.WriteImage(wxBitmap(smiley_xpm));
     r.WriteText(wxT(" Well, you can change text "));
 


@@ -690,9 +757,12 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     r.WriteText(wxT("colour, like this red bit."));
     r.EndTextColour();
 
     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();
 
     r.WriteText(wxT(" Naturally you can make things "));
     r.BeginBold();


@@ -770,7 +840,7 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     tabs.Add(600);
     tabs.Add(800);
     tabs.Add(1000);
     tabs.Add(600);
     tabs.Add(800);
     tabs.Add(1000);

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_TABS);
     attr.SetTabs(tabs);
     r.SetDefaultStyle(attr);
     attr.SetFlags(wxTEXT_ATTR_TABS);
     attr.SetTabs(tabs);
     r.SetDefaultStyle(attr);


@@ -818,6 +888,21 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
 
     r.Newline();
 
 
     r.Newline();
 

+    // Make a style suitable for showing a URL
+    wxRichTextAttr urlStyle;
+    urlStyle.SetTextColour(*wxBLUE);
+    urlStyle.SetFontUnderlined(true);
+
+    r.WriteText(wxT("wxRichTextCtrl can also display URLs, such as this one: "));
+    r.BeginStyle(urlStyle);
+    r.BeginURL(wxT("http://www.wxwidgets.org"));
+    r.WriteText(wxT("The wxWidgets Web Site"));
+    r.EndURL();
+    r.EndStyle();
+    r.WriteText(wxT(". Click on the URL to generate an event."));
+
+    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.EndParagraphSpacing();
     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.EndParagraphSpacing();


@@ -1023,7 +1108,7 @@ void MyFrame::OnFont(wxCommandEvent& WXUNUSED(event))
 
     if (formatDlg.ShowModal() == wxID_OK)
     {
 
     if (formatDlg.ShowModal() == wxID_OK)
     {

-        formatDlg.ApplyStyle(m_richTextCtrl, range);
+        formatDlg.ApplyStyle(m_richTextCtrl, range, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);

     }
 
     // Old method using wxFontDialog
     }
 
     // Old method using wxFontDialog


@@ -1099,7 +1184,7 @@ void MyFrame::OnUpdateFormat(wxUpdateUIEvent& event)
 
 void MyFrame::OnIndentMore(wxCommandEvent& WXUNUSED(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))
     attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
 
     if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr))


@@ -1108,7 +1193,6 @@ void MyFrame::OnIndentMore(wxCommandEvent& WXUNUSED(event))
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 

-        wxFontData fontData;

         attr.SetLeftIndent(attr.GetLeftIndent() + 100);
 
         attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
         attr.SetLeftIndent(attr.GetLeftIndent() + 100);
 
         attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);


@@ -1118,7 +1202,7 @@ void MyFrame::OnIndentMore(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnIndentLess(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))
     attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
 
     if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr))


@@ -1127,10 +1211,9 @@ void MyFrame::OnIndentLess(wxCommandEvent& WXUNUSED(event))
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 
         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);
         }
 
             m_richTextCtrl->SetStyle(range, attr);
         }


@@ -1139,7 +1222,7 @@ void MyFrame::OnIndentLess(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnLineSpacingHalf(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))
     attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
 
     if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr))


@@ -1148,7 +1231,6 @@ void MyFrame::OnLineSpacingHalf(wxCommandEvent& WXUNUSED(event))
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 

-        wxFontData fontData;

         attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
         attr.SetLineSpacing(15);
 
         attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
         attr.SetLineSpacing(15);
 


@@ -1158,7 +1240,7 @@ void MyFrame::OnLineSpacingHalf(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnLineSpacingDouble(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))
     attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
 
     if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr))


@@ -1167,7 +1249,6 @@ void MyFrame::OnLineSpacingDouble(wxCommandEvent& WXUNUSED(event))
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 

-        wxFontData fontData;

         attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
         attr.SetLineSpacing(20);
 
         attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
         attr.SetLineSpacing(20);
 


@@ -1177,7 +1258,7 @@ void MyFrame::OnLineSpacingDouble(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnLineSpacingSingle(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))
     attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
 
     if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr))


@@ -1186,7 +1267,6 @@ void MyFrame::OnLineSpacingSingle(wxCommandEvent& WXUNUSED(event))
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 

-        wxFontData fontData;

         attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
         attr.SetLineSpacing(0); // Can also use 10
 
         attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
         attr.SetLineSpacing(0); // Can also use 10
 


@@ -1196,7 +1276,7 @@ void MyFrame::OnLineSpacingSingle(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnParagraphSpacingMore(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))
     attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER);
 
     if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr))


@@ -1205,7 +1285,6 @@ void MyFrame::OnParagraphSpacingMore(wxCommandEvent& WXUNUSED(event))
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 
         if (m_richTextCtrl->HasSelection())
             range = m_richTextCtrl->GetSelectionRange();
 

-        wxFontData fontData;

         attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() + 20);
 
         attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER);
         attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() + 20);
 
         attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER);


@@ -1215,7 +1294,7 @@ void MyFrame::OnParagraphSpacingMore(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnParagraphSpacingLess(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))
     attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER);
 
     if (m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr))


@@ -1226,7 +1305,6 @@ void MyFrame::OnParagraphSpacingLess(wxCommandEvent& WXUNUSED(event))
 
         if (attr.GetParagraphSpacingAfter() >= 20)
         {
 
         if (attr.GetParagraphSpacingAfter() >= 20)
         {

-            wxFontData fontData;

             attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() - 20);
 
             attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER);
             attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() - 20);
 
             attr.SetFlags(wxTEXT_ATTR_PARA_SPACING_AFTER);


@@ -1252,6 +1330,19 @@ void MyFrame::OnViewHTML(wxCommandEvent& WXUNUSED(event))
     wxStringOutputStream strStream(& text);
 
     wxRichTextHTMLHandler htmlHandler;
     wxStringOutputStream strStream(& text);
 
     wxRichTextHTMLHandler htmlHandler;

+    htmlHandler.SetFlags(wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY);
+
+    wxArrayInt fontSizeMapping;
+    fontSizeMapping.Add(7);
+    fontSizeMapping.Add(9);
+    fontSizeMapping.Add(11);
+    fontSizeMapping.Add(12);
+    fontSizeMapping.Add(14);
+    fontSizeMapping.Add(22);
+    fontSizeMapping.Add(100);
+
+    htmlHandler.SetFontSizeMapping(fontSizeMapping);
+

     if (htmlHandler.SaveFile(& m_richTextCtrl->GetBuffer(), strStream))
     {
         win->SetPage(text);
     if (htmlHandler.SaveFile(& m_richTextCtrl->GetBuffer(), strStream))
     {
         win->SetPage(text);


@@ -1260,6 +1351,9 @@ void MyFrame::OnViewHTML(wxCommandEvent& WXUNUSED(event))
     boxSizer->Fit(& dialog);
 
     dialog.ShowModal();
     boxSizer->Fit(& dialog);
 
     dialog.ShowModal();

+
+    // Now delete the temporary in-memory images
+    htmlHandler.DeleteTemporaryImages();

 }
 
 // Demonstrates how you can change the style sheets and have the changes
 }
 
 // Demonstrates how you can change the style sheets and have the changes


@@ -1269,11 +1363,10 @@ void MyFrame::OnSwitchStyleSheets(wxCommandEvent& WXUNUSED(event))
 {
     static wxRichTextStyleSheet* gs_AlternateStyleSheet = NULL;
 
 {
     static wxRichTextStyleSheet* gs_AlternateStyleSheet = NULL;
 

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);

     wxRichTextStyleListCtrl *styleList = (wxRichTextStyleListCtrl*) FindWindow(ID_RICHTEXT_STYLE_LIST);
     wxRichTextStyleComboCtrl* styleCombo = (wxRichTextStyleComboCtrl*) FindWindow(ID_RICHTEXT_STYLE_COMBO);
 
     wxRichTextStyleListCtrl *styleList = (wxRichTextStyleListCtrl*) FindWindow(ID_RICHTEXT_STYLE_LIST);
     wxRichTextStyleComboCtrl* styleCombo = (wxRichTextStyleComboCtrl*) FindWindow(ID_RICHTEXT_STYLE_COMBO);
 

-    wxRichTextStyleSheet* sheet = ctrl->GetStyleSheet();
+    wxRichTextStyleSheet* sheet = m_richTextCtrl->GetStyleSheet();

 
     // One-time creation of an alternate style sheet
     if (!gs_AlternateStyleSheet)
 
     // One-time creation of an alternate style sheet
     if (!gs_AlternateStyleSheet)


@@ -1307,8 +1400,8 @@ void MyFrame::OnSwitchStyleSheets(wxCommandEvent& WXUNUSED(event))
     gs_AlternateStyleSheet = sheet;
     sheet = tmp;
 
     gs_AlternateStyleSheet = sheet;
     sheet = tmp;
 

-    ctrl->SetStyleSheet(sheet);
-    ctrl->ApplyStyleSheet(sheet); // Makes the control reflect the new style definitions
+    m_richTextCtrl->SetStyleSheet(sheet);
+    m_richTextCtrl->ApplyStyleSheet(sheet); // Makes the control reflect the new style definitions

 
     styleList->SetStyleSheet(sheet);
     styleList->UpdateStyles();
 
     styleList->SetStyleSheet(sheet);
     styleList->UpdateStyles();


@@ -1319,8 +1412,7 @@ void MyFrame::OnSwitchStyleSheets(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnManageStyles(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnManageStyles(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-    wxRichTextStyleSheet* sheet = ctrl->GetStyleSheet();
+    wxRichTextStyleSheet* sheet = m_richTextCtrl->GetStyleSheet();

 
     int flags = wxRICHTEXT_ORGANISER_CREATE_STYLES|wxRICHTEXT_ORGANISER_EDIT_STYLES;
 
 
     int flags = wxRICHTEXT_ORGANISER_CREATE_STYLES|wxRICHTEXT_ORGANISER_EDIT_STYLES;
 


@@ -1330,11 +1422,9 @@ void MyFrame::OnManageStyles(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-
-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_FONT);
     attr.SetFlags(wxTEXT_ATTR_FONT);

-    ctrl->GetStyle(ctrl->GetInsertionPoint(), attr);
+    m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr);

 
     wxString currentFontName;
     if (attr.HasFont() && attr.GetFont().Ok())
 
     wxString currentFontName;
     if (attr.HasFont() && attr.GetFont().Ok())


@@ -1350,16 +1440,16 @@ void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event))
     {
         if (dlg.HasSelection())
         {
     {
         if (dlg.HasSelection())
         {

-            long insertionPoint = ctrl->GetInsertionPoint();
+            long insertionPoint = m_richTextCtrl->GetInsertionPoint();

 
 

-            ctrl->WriteText(dlg.GetSymbol());
+            m_richTextCtrl->WriteText(dlg.GetSymbol());

 
             if (!dlg.UseNormalFont())
             {
                 wxFont font(attr.GetFont());
                 font.SetFaceName(dlg.GetFontName());
                 attr.SetFont(font);
 
             if (!dlg.UseNormalFont())
             {
                 wxFont font(attr.GetFont());
                 font.SetFaceName(dlg.GetFontName());
                 attr.SetFont(font);

-                ctrl->SetStyle(insertionPoint, insertionPoint+1, attr);
+                m_richTextCtrl->SetStyle(insertionPoint, insertionPoint+1, attr);

             }
         }
     }
             }
         }
     }


@@ -1367,23 +1457,20 @@ void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnNumberList(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnNumberList(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-    
-    if (ctrl->HasSelection())
+    if (m_richTextCtrl->HasSelection())

     {
     {

-        wxRichTextRange range = ctrl->GetSelectionRange();
-        ctrl->SetListStyle(range, wxT("Numbered List 1"), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RENUMBER);
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->SetListStyle(range, wxT("Numbered List 1"), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RENUMBER);

     }
 }
 
 void MyFrame::OnBulletsAndNumbering(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void MyFrame::OnBulletsAndNumbering(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-    wxRichTextStyleSheet* sheet = ctrl->GetStyleSheet();
+    wxRichTextStyleSheet* sheet = m_richTextCtrl->GetStyleSheet();

 
     int flags = wxRICHTEXT_ORGANISER_BROWSE_NUMBERING;
 
 
     int flags = wxRICHTEXT_ORGANISER_BROWSE_NUMBERING;
 

-    wxRichTextStyleOrganiserDialog dlg(flags, sheet, ctrl, this, wxID_ANY, _("Bullets and Numbering"));
+    wxRichTextStyleOrganiserDialog dlg(flags, sheet, m_richTextCtrl, this, wxID_ANY, _("Bullets and Numbering"));

     if (dlg.ShowModal() == wxID_OK)
     {
         if (dlg.GetSelectedStyleDefinition())
     if (dlg.ShowModal() == wxID_OK)
     {
         if (dlg.GetSelectedStyleDefinition())


@@ -1393,56 +1480,90 @@ void MyFrame::OnBulletsAndNumbering(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnItemizeList(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnItemizeList(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-
-    if (ctrl->HasSelection())
+    if (m_richTextCtrl->HasSelection())

     {
     {

-        wxRichTextRange range = ctrl->GetSelectionRange();
-        ctrl->SetListStyle(range, wxT("Bullet List 1"));
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->SetListStyle(range, wxT("Bullet List 1"));

     }
 }
 
 void MyFrame::OnRenumberList(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void MyFrame::OnRenumberList(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-
-    if (ctrl->HasSelection())
+    if (m_richTextCtrl->HasSelection())

     {
     {

-        wxRichTextRange range = ctrl->GetSelectionRange();
-        ctrl->NumberList(range, NULL, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RENUMBER);
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->NumberList(range, NULL, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RENUMBER);

     }
 }
 
 void MyFrame::OnPromoteList(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void MyFrame::OnPromoteList(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-
-    if (ctrl->HasSelection())
+    if (m_richTextCtrl->HasSelection())

     {
     {

-        wxRichTextRange range = ctrl->GetSelectionRange();
-        ctrl->PromoteList(1, range, NULL);
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->PromoteList(1, range, NULL);

     }
 }
 
 void MyFrame::OnDemoteList(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void MyFrame::OnDemoteList(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-
-    if (ctrl->HasSelection())
+    if (m_richTextCtrl->HasSelection())

     {
     {

-        wxRichTextRange range = ctrl->GetSelectionRange();
-        ctrl->PromoteList(-1, range, NULL);
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->PromoteList(-1, range, NULL);

     }
 }
 
 void MyFrame::OnClearList(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void MyFrame::OnClearList(wxCommandEvent& WXUNUSED(event))
 {

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
+    if (m_richTextCtrl->HasSelection())
+    {
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->ClearListStyle(range);
+    }
+}

 
 

-    if (ctrl->HasSelection())
+void MyFrame::OnInsertURL(wxCommandEvent& WXUNUSED(event))
+{
+    wxString url = wxGetTextFromUser(_("URL:"), _("Insert URL"));
+    if (!url.IsEmpty())

     {
     {

-        wxRichTextRange range = ctrl->GetSelectionRange();
-        ctrl->ClearListStyle(range);
+        // Make a style suitable for showing a URL
+        wxRichTextAttr urlStyle;
+        urlStyle.SetTextColour(*wxBLUE);
+        urlStyle.SetFontUnderlined(true);
+
+        m_richTextCtrl->BeginStyle(urlStyle);
+        m_richTextCtrl->BeginURL(url);
+        m_richTextCtrl->WriteText(url);
+        m_richTextCtrl->EndURL();
+        m_richTextCtrl->EndStyle();

     }
 }
 
     }
 }
 

+void MyFrame::OnURL(wxTextUrlEvent& event)
+{
+    wxMessageBox(event.GetString());
+}
+
+// Veto style sheet replace events when loading from XML, since we want
+// to keep the original style sheet.
+void MyFrame::OnStyleSheetReplacing(wxRichTextEvent& event)
+{
+    event.Veto();
+}
+
+void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event))
+{
+    wxGetApp().GetPrinting()->PrintBuffer(m_richTextCtrl->GetBuffer());
+}
+
+void MyFrame::OnPreview(wxCommandEvent& WXUNUSED(event))
+{
+    wxGetApp().GetPrinting()->PreviewBuffer(m_richTextCtrl->GetBuffer());
+}
+
+void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
+{
+    wxGetApp().GetPrinting()->PageSetup();
+}