From: Karsten Ballüder Date: Wed, 1 Dec 1999 18:05:54 +0000 (+0000) Subject: rtf cut&paste works now, html export fixed X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/371ee4026efaed733fb2d65cda10aa72745b4f9f?ds=inline rtf cut&paste works now, html export fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/richedit/TODO b/samples/richedit/TODO index f9036040e9..fb8971ba94 100644 --- a/samples/richedit/TODO +++ b/samples/richedit/TODO @@ -2,9 +2,6 @@ BUGS ===================================================================== -- dmalloc shows duplicate deletion after merging two lines and - deleting the second half - - word wrap for objects with lots of non-space needs to search in positive direction if begin of first object is reached @@ -13,26 +10,14 @@ TODO - use printsetup margins -- merge RecalulateXXX and Layout() into one - - UNDO!! - replacement of llist in window -Improve speed! (See layout problem below!) - - - wxlwindow needs to shrink scrollbar range when window contents get removed - - When selecting with the mouse, scroll window if pointer is outside. - - - -- The import of a private data object does not work yet, we need to get - the objects back from the string. - - update rectangle (needs support in wxllist and wxWindows) --> needs a bit of fixing still some code bits are commented out in wxlwindow.cpp offset handling seems a bit dodgy, white shadow to top/left of cursor - - DragNDrop - - Update docs, do full rtf/html editing. - - Verify/fix html export. +- add wxHTML parser to import HTML +- add some kind of callback for objects with userdata +- use wxTempFile to get rid of temporary image files diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp index 15d14b81ee..d650aea0ae 100644 --- a/samples/richedit/wxLayout.cpp +++ b/samples/richedit/wxLayout.cpp @@ -18,6 +18,7 @@ #include "wxLayout.h" #include +#include #include @@ -40,7 +41,7 @@ enum ids ID_PRINT_SETUP, ID_PAGE_SETUP, ID_PREVIEW, ID_PRINT_PS, ID_PRINT_SETUP_PS, ID_PAGE_SETUP_PS,ID_PREVIEW_PS, ID_WRAP, ID_NOWRAP, ID_PASTE, ID_COPY, ID_CUT, - ID_PASTE_PRIMARY, + ID_COPY_PRIMARY, ID_PASTE_PRIMARY, ID_FIND, ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT, ID_TEST, ID_LINEBREAKS_TEST, ID_LONG_TEST, ID_URL_TEST @@ -105,10 +106,11 @@ MyFrame::MyFrame(void) : edit_menu->AppendSeparator(); edit_menu->Append(ID_COPY, "&Copy", "Copy text to clipboard."); edit_menu->Append(ID_CUT, "Cu&t", "Cut text to clipboard."); -#ifdef __WXGTK__ edit_menu->Append(ID_PASTE,"&Paste", "Paste text from clipboard."); -#endif +#ifdef __WXGTK__ + edit_menu->Append(ID_COPY_PRIMARY, "C&opy primary", "Copy text to primary selecton."); edit_menu->Append(ID_PASTE_PRIMARY,"&Paste primary", "Paste text from primary selection."); +#endif edit_menu->Append(ID_FIND, "&Find", "Find text."); menu_bar->Append(edit_menu, "&Edit" ); @@ -283,17 +285,23 @@ void MyFrame::OnCommand( wxCommandEvent &event ) cerr << "Received click event." << endl; break; case ID_PASTE: - m_lwin->Paste(); + m_lwin->Paste(TRUE); m_lwin->Refresh(FALSE); break; #ifdef __WXGTK__ case ID_PASTE_PRIMARY: - m_lwin->Paste(TRUE); + // text only from primary: + m_lwin->Paste(FALSE, TRUE); + m_lwin->Refresh(FALSE); + break; + case ID_COPY_PRIMARY: + // copy text-only to primary selection: + m_lwin->Copy(FALSE,FALSE,TRUE); m_lwin->Refresh(FALSE); break; #endif case ID_COPY: - m_lwin->Copy(); + m_lwin->Copy(TRUE,TRUE,FALSE); m_lwin->Refresh(FALSE); break; case ID_CUT: @@ -311,13 +319,14 @@ void MyFrame::OnCommand( wxCommandEvent &event ) wxLayoutExportObject *export0; wxLayoutExportStatus status(m_lwin->GetLayoutList()); + cout << "" << endl; while((export0 = wxLayoutExport( &status, WXLO_EXPORT_AS_HTML)) != NULL) { if(export0->type == WXLO_EXPORT_HTML) cout << *(export0->content.text); else - cout << "