X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4005cc780c59b38290754ff3fb5199e792e4f094..b231914f6abe2c148193b006a0919d60575f9a20:/samples/richedit/wxLayout.cpp?ds=sidebyside diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp index c23c45580b..e70db238f9 100644 --- a/samples/richedit/wxLayout.cpp +++ b/samples/richedit/wxLayout.cpp @@ -18,7 +18,9 @@ #include "wxLayout.h" #include +#include +#include #include "Micon.xpm" @@ -39,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 @@ -104,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" ); @@ -123,6 +126,12 @@ MyFrame::MyFrame(void) : m_lwin->SetEditable(true); m_lwin->SetWrapMargin(40); m_lwin->SetFocus(); + + // JACS: under MSW, the window doesn't show the caret initially, + // and the following line I added doesn't help either. + // going to another window and then back again fixes it. + // m_lwin->OnSetFocus(wxFocusEvent()); + Clear(); #if 0 @@ -162,7 +171,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); @@ -238,9 +251,9 @@ MyFrame::AddSampleText(wxLayoutList *llist) void MyFrame::Clear(void) { - wxColour colBg(0, 255, 255); + wxColour colBg(0, 0, 0); - m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false, wxGREEN, &colBg); + m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false, wxRED, &colBg); } @@ -276,55 +289,64 @@ 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: m_lwin->Cut(); m_lwin->Refresh(FALSE); break; +#ifdef M_BASEDIR case ID_FIND: m_lwin->Find("void"); m_lwin->Refresh(FALSE); break; +#endif case ID_HTML: { - wxLayoutExportObject *export; + wxLayoutExportObject *export0; wxLayoutExportStatus status(m_lwin->GetLayoutList()); - while((export = wxLayoutExport( &status, + cout << "" << endl; + while((export0 = wxLayoutExport( &status, WXLO_EXPORT_AS_HTML)) != NULL) { - if(export->type == WXLO_EXPORT_HTML) - cout << *(export->content.text); + if(export0->type == WXLO_EXPORT_HTML) + cout << *(export0->content.text); else - cout << "