Compilation fix for PCH-less in wxInfoBar.

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

diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index 5b9d31f6726b932086dc92967388a4cf4eb54fb4..168a2046f9ee2f1aef8f02d82e93bc41117ba129 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


@@ -71,6 +76,8 @@
 #include "wx/richtext/richtexthtml.h"
 #include "wx/richtext/richtextformatdlg.h"
 #include "wx/richtext/richtextsymboldlg.h"
 #include "wx/richtext/richtexthtml.h"
 #include "wx/richtext/richtextformatdlg.h"
 #include "wx/richtext/richtextsymboldlg.h"

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

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


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


@@ -149,13 +158,37 @@ public:
     void OnParagraphSpacingMore(wxCommandEvent& event);
     void OnParagraphSpacingLess(wxCommandEvent& event);
 
     void OnParagraphSpacingMore(wxCommandEvent& event);
     void OnParagraphSpacingLess(wxCommandEvent& event);
 

+    void OnNumberList(wxCommandEvent& event);
+    void OnBulletsAndNumbering(wxCommandEvent& event);
+    void OnItemizeList(wxCommandEvent& event);
+    void OnRenumberList(wxCommandEvent& event);
+    void OnPromoteList(wxCommandEvent& event);
+    void OnDemoteList(wxCommandEvent& event);
+    void OnClearList(wxCommandEvent& event);
+
+    void OnReload(wxCommandEvent& event);
+

     void OnViewHTML(wxCommandEvent& event);
 
     void OnSwitchStyleSheets(wxCommandEvent& event);
     void OnViewHTML(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);
+
+protected:

 
     // 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);
 

+    // Write text
+    void WriteInitialText();
+

 private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()


@@ -181,7 +214,10 @@ enum
     ID_FORMAT_PARAGRAPH,
     ID_FORMAT_CONTENT,
 
     ID_FORMAT_PARAGRAPH,
     ID_FORMAT_CONTENT,
 

+    ID_RELOAD,
+

     ID_INSERT_SYMBOL,
     ID_INSERT_SYMBOL,

+    ID_INSERT_URL,

 
     ID_FORMAT_ALIGN_LEFT,
     ID_FORMAT_ALIGN_CENTRE,
 
     ID_FORMAT_ALIGN_LEFT,
     ID_FORMAT_ALIGN_CENTRE,


@@ -197,8 +233,21 @@ enum
     ID_FORMAT_LINE_SPACING_DOUBLE,
     ID_FORMAT_LINE_SPACING_SINGLE,
 
     ID_FORMAT_LINE_SPACING_DOUBLE,
     ID_FORMAT_LINE_SPACING_SINGLE,
 

+    ID_FORMAT_NUMBER_LIST,
+    ID_FORMAT_BULLETS_AND_NUMBERING,
+    ID_FORMAT_ITEMIZE_LIST,
+    ID_FORMAT_RENUMBER_LIST,
+    ID_FORMAT_PROMOTE_LIST,
+    ID_FORMAT_DEMOTE_LIST,
+    ID_FORMAT_CLEAR_LIST,
+

     ID_VIEW_HTML,
     ID_SWITCH_STYLE_SHEETS,
     ID_VIEW_HTML,
     ID_SWITCH_STYLE_SHEETS,

+    ID_MANAGE_STYLES,
+
+    ID_PRINT,
+    ID_PREVIEW,
+    ID_PAGE_SETUP,

 
     ID_RICHTEXT_CTRL,
     ID_RICHTEXT_STYLE_LIST,
 
     ID_RICHTEXT_CTRL,
     ID_RICHTEXT_STYLE_LIST,


@@ -252,10 +301,29 @@ 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_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_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_ITEMIZE_LIST, MyFrame::OnItemizeList)
+    EVT_MENU(ID_FORMAT_RENUMBER_LIST, MyFrame::OnRenumberList)
+    EVT_MENU(ID_FORMAT_PROMOTE_LIST, MyFrame::OnPromoteList)
+    EVT_MENU(ID_FORMAT_DEMOTE_LIST, MyFrame::OnDemoteList)
+    EVT_MENU(ID_FORMAT_CLEAR_LIST, MyFrame::OnClearList)

 
     EVT_MENU(ID_VIEW_HTML, MyFrame::OnViewHTML)
     EVT_MENU(ID_SWITCH_STYLE_SHEETS, MyFrame::OnSwitchStyleSheets)
 
     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


@@ -276,11 +344,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();
 


@@ -301,8 +376,14 @@ 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
     // 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);

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)


@@ -316,7 +397,9 @@ bool MyApp::OnInit()
 
 int MyApp::OnExit()
 {
 
 int MyApp::OnExit()
 {

+    delete m_printing;

     delete m_styleSheet;
     delete m_styleSheet;

+

     return 0;
 }
 
     return 0;
 }
 


@@ -354,7 +437,7 @@ void MyApp::CreateStyles()
     wxRichTextAttr indentedAttr2;
     indentedAttr2.SetFontFaceName(romanFont.GetFaceName());
     indentedAttr2.SetFontSize(12);
     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);
     indentedAttr2.SetTextColour(*wxRED);
     indentedAttr2.SetFontSize(12);
     indentedAttr2.SetLeftIndent(100, 0);


@@ -381,7 +464,7 @@ void MyApp::CreateStyles()
     wxRichTextAttr boldAttr;
     boldAttr.SetFontFaceName(romanFont.GetFaceName());
     boldAttr.SetFontSize(12);
     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);
     // We only want to affect boldness
     boldAttr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
     boldDef->SetStyle(boldAttr);


@@ -392,7 +475,7 @@ void MyApp::CreateStyles()
     wxRichTextAttr italicAttr;
     italicAttr.SetFontFaceName(romanFont.GetFaceName());
     italicAttr.SetFontSize(12);
     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);
     // We only want to affect italics
     italicAttr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
     italicDef->SetStyle(italicAttr);


@@ -403,13 +486,70 @@ void MyApp::CreateStyles()
     wxRichTextAttr redAttr;
     redAttr.SetFontFaceName(romanFont.GetFaceName());
     redAttr.SetFontSize(12);
     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);
     redDef->SetStyle(redAttr);
 
     m_styleSheet->AddCharacterStyle(redDef);
     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);
     redDef->SetStyle(redAttr);
 
     m_styleSheet->AddCharacterStyle(redDef);

+
+    wxRichTextListStyleDefinition* bulletList = new wxRichTextListStyleDefinition(wxT("Bullet List 1"));
+    int i;
+    for (i = 0; i < 10; i++)
+    {
+        wxString bulletText;
+        if (i == 0)
+            bulletText = wxT("standard/circle");
+        else if (i == 1)
+            bulletText = wxT("standard/square");
+        else if (i == 2)
+            bulletText = wxT("standard/circle");
+        else if (i == 3)
+            bulletText = wxT("standard/square");
+        else
+            bulletText = wxT("standard/circle");
+
+        bulletList->SetAttributes(i, (i+1)*60, 60, wxTEXT_ATTR_BULLET_STYLE_STANDARD, bulletText);
+    }
+
+    m_styleSheet->AddListStyle(bulletList);
+
+    wxRichTextListStyleDefinition* numberedList = new wxRichTextListStyleDefinition(wxT("Numbered List 1"));
+    for (i = 0; i < 10; i++)
+    {
+        long numberStyle;
+        if (i == 0)
+            numberStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD;
+        else if (i == 1)
+            numberStyle = wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER|wxTEXT_ATTR_BULLET_STYLE_PARENTHESES;
+        else if (i == 2)
+            numberStyle = wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER|wxTEXT_ATTR_BULLET_STYLE_PARENTHESES;
+        else if (i == 3)
+            numberStyle = wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER|wxTEXT_ATTR_BULLET_STYLE_PARENTHESES;
+        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);
+
+    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);

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


@@ -429,15 +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;
 
     // 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_RELOAD, wxT("&Reload Text\tF2"), wxT("Reload the initial text"));
+    fileMenu->AppendSeparator();
+    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->AppendSeparator();

-    fileMenu->Append(ID_VIEW_HTML, _T("&View as HTML"), _T("View HTML"));
+    fileMenu->Append(ID_VIEW_HTML, wxT("&View as HTML"), wxT("View HTML"));

     fileMenu->AppendSeparator();
     fileMenu->AppendSeparator();

-    fileMenu->Append(ID_Quit, _T("E&xit\tAlt+X"), _T("Quit this program"));
+    fileMenu->Append(ID_Quit, wxT("E&xit\tAlt+X"), wxT("Quit this program"));

 
     wxMenu* editMenu = new wxMenu;
     editMenu->Append(wxID_UNDO, _("&Undo\tCtrl+Z"));
 
     wxMenu* editMenu = new wxMenu;
     editMenu->Append(wxID_UNDO, _("&Undo\tCtrl+Z"));


@@ -447,8 +593,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


@@ -481,17 +625,30 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     formatMenu->Append(ID_FORMAT_CONTENT, _("Font and Pa&ragraph...\tShift+Ctrl+F"));
     formatMenu->AppendSeparator();
     formatMenu->Append(ID_SWITCH_STYLE_SHEETS, _("&Switch Style Sheets"));
     formatMenu->Append(ID_FORMAT_CONTENT, _("Font and Pa&ragraph...\tShift+Ctrl+F"));
     formatMenu->AppendSeparator();
     formatMenu->Append(ID_SWITCH_STYLE_SHEETS, _("&Switch Style Sheets"));

+    formatMenu->Append(ID_MANAGE_STYLES, _("&Manage Styles"));
+
+    wxMenu* listsMenu = new wxMenu;
+    listsMenu->Append(ID_FORMAT_BULLETS_AND_NUMBERING, _("Bullets and &Numbering..."));
+    listsMenu->AppendSeparator();
+    listsMenu->Append(ID_FORMAT_NUMBER_LIST, _("Number List"));
+    listsMenu->Append(ID_FORMAT_ITEMIZE_LIST, _("Itemize List"));
+    listsMenu->Append(ID_FORMAT_RENUMBER_LIST, _("Renumber List"));
+    listsMenu->Append(ID_FORMAT_PROMOTE_LIST, _("Promote List Items"));
+    listsMenu->Append(ID_FORMAT_DEMOTE_LIST, _("Demote List Items"));
+    listsMenu->Append(ID_FORMAT_CLEAR_LIST, _("Clear List Formatting"));

 
     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();

-    menuBar->Append(fileMenu, _T("&File"));
-    menuBar->Append(editMenu, _T("&Edit"));
-    menuBar->Append(formatMenu, _T("F&ormat"));
-    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);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);


@@ -504,47 +661,47 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     if ( !is_pda )
     {
         CreateStatusBar(2);
     if ( !is_pda )
     {
         CreateStatusBar(2);

-        SetStatusText(_T("Welcome to wxRichTextCtrl!"));
+        SetStatusText(wxT("Welcome to wxRichTextCtrl!"));

     }
 #endif
 
     wxToolBar* toolBar = CreateToolBar();
 
     }
 #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->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->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->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->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->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->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();
 
 
     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);
 
 
     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);


@@ -555,41 +712,33 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     combo->SetRichTextCtrl(m_richTextCtrl);
     combo->UpdateStyles();
 
     combo->SetRichTextCtrl(m_richTextCtrl);
     combo->UpdateStyles();
 

-    wxRichTextStyleListBox* styleListBox = new wxRichTextStyleListBox(splitter, ID_RICHTEXT_STYLE_LIST);
+    wxRichTextStyleListCtrl* styleListCtrl = new wxRichTextStyleListCtrl(splitter, ID_RICHTEXT_STYLE_LIST);

 
     wxSize display = wxGetDisplaySize();
     if ( is_pda && ( display.GetWidth() < display.GetHeight() ) )
     {
 
     wxSize display = wxGetDisplaySize();
     if ( is_pda && ( display.GetWidth() < display.GetHeight() ) )
     {

-        splitter->SplitHorizontally(m_richTextCtrl, styleListBox);
+        splitter->SplitHorizontally(m_richTextCtrl, styleListCtrl);

     }
     else
     {
     }
     else
     {

-        splitter->SplitVertically(m_richTextCtrl, styleListBox, 500);
+        splitter->SplitVertically(m_richTextCtrl, styleListCtrl, 500);

     }
 
     splitter->UpdateSize();
 
     }
 
     splitter->UpdateSize();
 

-    styleListBox->SetStyleSheet(wxGetApp().GetStyleSheet());
-    styleListBox->SetRichTextCtrl(m_richTextCtrl);
-    styleListBox->UpdateStyles();
+    styleListCtrl->SetStyleSheet(wxGetApp().GetStyleSheet());
+    styleListCtrl->SetRichTextCtrl(m_richTextCtrl);
+    styleListCtrl->UpdateStyles();
+
+    WriteInitialText();
+}

 
 

+// Write text
+void MyFrame::WriteInitialText()
+{

     wxRichTextCtrl& r = *m_richTextCtrl;
 
     wxRichTextCtrl& r = *m_richTextCtrl;
 

-#if 0
-    r.WriteText(wxT("One\nTwo\nThree\n"));
-#if 0
-    int i;
-    for (i = 0; i < 3; i++)
-    {
-
-        wxRichTextParagraph* para = r.GetBuffer().GetParagraphAtLine(i);
-        if (para)
-        {
-            wxLogDebug(wxT("Range for paragraph %d: %d -> %d"), i, para->GetRange().GetStart(), para->GetRange().GetEnd());
-        }
-    }
-#endif
-#else
+    r.SetDefaultStyle(wxRichTextAttr());

 
     r.BeginSuppressUndo();
 
 
     r.BeginSuppressUndo();
 


@@ -599,25 +748,28 @@ 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\n"));

     r.EndFontSize();
     r.EndFontSize();

-    r.Newline();

 
     r.BeginItalic();
     r.WriteText(wxT("by Julian Smart"));
     r.EndItalic();
 
     r.EndBold();
 
     r.BeginItalic();
     r.WriteText(wxT("by Julian Smart"));
     r.EndItalic();
 
     r.EndBold();

-

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

-    r.WriteImage(wxBitmap(zebra_xpm));

 
 

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

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

+    r.EndAlignment();
+

     r.WriteText(wxT("What can you do with this thing? "));
     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 "));
 


@@ -625,9 +777,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();


@@ -646,57 +801,55 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
 
     r.WriteText(wxT(" Next we'll show an indented paragraph."));
 
 
     r.WriteText(wxT(" Next we'll show an indented paragraph."));
 

-    r.BeginLeftIndent(60);

     r.Newline();
 
     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.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.Newline();
 

+    r.EndLeftIndent();
+

     r.WriteText(wxT("Next, we'll show a first-line indent, achieved using BeginLeftIndent(100, -40)."));
 
     r.WriteText(wxT("Next, we'll show a first-line indent, achieved using BeginLeftIndent(100, -40)."));
 

-    r.BeginLeftIndent(100, -40);

     r.Newline();
 
     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.Newline();
 

+    r.EndLeftIndent();
+

     r.WriteText(wxT("Numbered bullets are possible, again using subindents:"));
     r.WriteText(wxT("Numbered bullets are possible, again using subindents:"));

+    r.Newline();

 
     r.BeginNumberedBullet(1, 100, 60);
 
     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.Newline();

-
-    r.WriteText(wxT("This is my first item. Note that wxRichTextCtrl doesn't automatically do numbering, but this will be added later."));

     r.EndNumberedBullet();
 
     r.BeginNumberedBullet(2, 100, 60);
     r.EndNumberedBullet();
 
     r.BeginNumberedBullet(2, 100, 60);

-    r.Newline();
-

     r.WriteText(wxT("This is my second item."));
     r.WriteText(wxT("This is my second item."));

-    r.EndNumberedBullet();
-

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

+    r.EndNumberedBullet();

 
     r.WriteText(wxT("The following paragraph is right-indented:"));
 
     r.WriteText(wxT("The following paragraph is right-indented:"));

+    r.Newline();

 
     r.BeginRightIndent(200);
 
     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.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.Newline();
 

+    r.EndRightIndent();
+

     r.WriteText(wxT("The following paragraph is right-aligned with 1.5 line spacing:"));
     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.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.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();
 
     r.EndLineSpacing();
     r.EndAlignment();
 


@@ -710,58 +863,69 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     attr.SetTabs(tabs);
     r.SetDefaultStyle(attr);
 
     attr.SetTabs(tabs);
     r.SetDefaultStyle(attr);
 

-    r.Newline();

     r.WriteText(wxT("This line contains tabs:\tFirst tab\tSecond tab\tThird tab"));
     r.WriteText(wxT("This line contains tabs:\tFirst tab\tSecond tab\tThird tab"));

-

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

+

     r.WriteText(wxT("Other notable features of wxRichTextCtrl include:"));
     r.WriteText(wxT("Other notable features of wxRichTextCtrl include:"));

+    r.Newline();

 
     r.BeginSymbolBullet(wxT('*'), 100, 60);
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);

-    r.Newline();

     r.WriteText(wxT("Compatibility with wxTextCtrl API"));
     r.WriteText(wxT("Compatibility with wxTextCtrl API"));

+    r.Newline();

     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);
     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);

-    r.Newline();

     r.WriteText(wxT("Easy stack-based BeginXXX()...EndXXX() style setting in addition to SetStyle()"));
     r.WriteText(wxT("Easy stack-based BeginXXX()...EndXXX() style setting in addition to SetStyle()"));

+    r.Newline();

     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);
     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);

-    r.Newline();

     r.WriteText(wxT("XML loading and saving"));
     r.WriteText(wxT("XML loading and saving"));

+    r.Newline();

     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);
     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);

-    r.Newline();

     r.WriteText(wxT("Undo/Redo, with batching option and Undo suppressing"));
     r.WriteText(wxT("Undo/Redo, with batching option and Undo suppressing"));

+    r.Newline();

     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);
     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);

-    r.Newline();

     r.WriteText(wxT("Clipboard copy and paste"));
     r.WriteText(wxT("Clipboard copy and paste"));

+    r.Newline();

     r.EndSymbolBullet();
 
     r.BeginSymbolBullet(wxT('*'), 100, 60);
     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.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.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.WriteText(wxT("A design that can easily be extended to other content types, ultimately with text boxes, tables, controls, and so on"));

+    r.Newline();

     r.EndSymbolBullet();
 
     r.EndSymbolBullet();
 

+    // 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.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();
 
     r.EndParagraphSpacing();
 
     r.EndSuppressUndo();

-#endif

 }
 
 }
 

-

 // event handlers
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 // event handlers
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))


@@ -773,8 +937,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
 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
 }
 
 // Forward command events to the current rich text control, if any


@@ -796,7 +960,7 @@ bool MyFrame::ProcessEvent(wxEvent& event)
             s_id = event.GetId();
 
             wxWindow* focusWin = wxFindFocusDescendant(this);
             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;
             {
                 //s_command = NULL;
                 s_eventType = 0;


@@ -959,7 +1123,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


@@ -1035,7 +1199,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))


@@ -1044,7 +1208,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);


@@ -1054,7 +1217,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))


@@ -1063,10 +1226,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);
         }


@@ -1075,7 +1237,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))


@@ -1084,7 +1246,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);
 


@@ -1094,7 +1255,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))


@@ -1103,7 +1264,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);
 


@@ -1113,7 +1273,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))


@@ -1122,7 +1282,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
 


@@ -1132,7 +1291,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))


@@ -1141,7 +1300,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);


@@ -1151,7 +1309,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))


@@ -1162,7 +1320,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);


@@ -1171,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);
 void MyFrame::OnViewHTML(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dialog(this, wxID_ANY, _("HTML"), wxDefaultPosition, wxSize(500, 400), wxDEFAULT_DIALOG_STYLE);


@@ -1188,6 +1351,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);


@@ -1196,6 +1372,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


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

-    wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-    wxRichTextStyleListBox* styleList = (wxRichTextStyleListBox*) FindWindow(ID_RICHTEXT_STYLE_LIST);
+    wxRichTextStyleListCtrl *styleList = (wxRichTextStyleListCtrl*) FindWindow(ID_RICHTEXT_STYLE_LIST);

     wxRichTextStyleComboCtrl* styleCombo = (wxRichTextStyleComboCtrl*) FindWindow(ID_RICHTEXT_STYLE_COMBO);
 
     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)


@@ -1243,8 +1421,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();


@@ -1253,13 +1431,21 @@ void MyFrame::OnSwitchStyleSheets(wxCommandEvent& WXUNUSED(event))
     styleCombo->UpdateStyles();
 }
 
     styleCombo->UpdateStyles();
 }
 

-void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnManageStyles(wxCommandEvent& WXUNUSED(event))

 {
 {

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

 
 

-    wxTextAttrEx attr;
+    int flags = wxRICHTEXT_ORGANISER_CREATE_STYLES|wxRICHTEXT_ORGANISER_EDIT_STYLES;
+
+    wxRichTextStyleOrganiserDialog dlg(flags, sheet, NULL, this, wxID_ANY, _("Style Manager"));
+    dlg.ShowModal();
+}
+
+void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event))
+{
+    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())


@@ -1275,17 +1461,130 @@ 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);

             }
         }
     }
 }
             }
         }
     }
 }

+
+void MyFrame::OnNumberList(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_richTextCtrl->HasSelection())
+    {
+        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))
+{
+    wxRichTextStyleSheet* sheet = m_richTextCtrl->GetStyleSheet();
+
+    int flags = wxRICHTEXT_ORGANISER_BROWSE_NUMBERING;
+
+    wxRichTextStyleOrganiserDialog dlg(flags, sheet, m_richTextCtrl, this, wxID_ANY, _("Bullets and Numbering"));
+    if (dlg.ShowModal() == wxID_OK)
+    {
+        if (dlg.GetSelectedStyleDefinition())
+            dlg.ApplyStyle();
+    }
+}
+
+void MyFrame::OnItemizeList(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_richTextCtrl->HasSelection())
+    {
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->SetListStyle(range, wxT("Bullet List 1"));
+    }
+}
+
+void MyFrame::OnRenumberList(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_richTextCtrl->HasSelection())
+    {
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->NumberList(range, NULL, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RENUMBER);
+    }
+}
+
+void MyFrame::OnPromoteList(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_richTextCtrl->HasSelection())
+    {
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->PromoteList(1, range, NULL);
+    }
+}
+
+void MyFrame::OnDemoteList(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_richTextCtrl->HasSelection())
+    {
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->PromoteList(-1, range, NULL);
+    }
+}
+
+void MyFrame::OnClearList(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_richTextCtrl->HasSelection())
+    {
+        wxRichTextRange range = m_richTextCtrl->GetSelectionRange();
+        m_richTextCtrl->ClearListStyle(range);
+    }
+}
+
+void MyFrame::OnInsertURL(wxCommandEvent& WXUNUSED(event))
+{
+    wxString url = wxGetTextFromUser(_("URL:"), _("Insert URL"));
+    if (!url.IsEmpty())
+    {
+        // 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();
+}