X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b8ab3827f251e1b4503b24fac433b3e1a16a4b9..4b37e99afcedd67292c24e93677a83b76dc6b625:/samples/richedit/wxLayout.cpp diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp index 15d14b81ee..89fe57e094 100644 --- a/samples/richedit/wxLayout.cpp +++ b/samples/richedit/wxLayout.cpp @@ -11,15 +11,20 @@ #pragma implementation "wxLayout.h" #endif -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ # pragma hdrstop #endif #include "wxLayout.h" #include +#include -#include +#if wxUSE_IOSTREAMH + #include +#else + #include +#endif #include "Micon.xpm" @@ -40,7 +45,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 +110,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" ); @@ -169,7 +175,11 @@ MyFrame::AddSampleText(wxLayoutList *llist) llist->Insert("The quick brown fox jumps over the lazy dog."); llist->LineBreak(); llist->Insert("Hello "); +#if wxICON_IS_BITMAP llist->Insert(new wxLayoutObjectIcon(new wxICON(Micon))); +#else + llist->Insert(new wxLayoutObjectIcon(new wxBitmap (wxICON(Micon)))); +#endif llist->SetFontWeight(wxBOLD); llist->Insert("World! "); llist->SetFontWeight(wxNORMAL); @@ -283,17 +293,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 +327,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 << "