X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dabb9b6d29300a490a5d287b3cd4d63ca72c7ce7..30738aae14dfbce0c492d8696c861947228028c2:/samples/text/text.cpp diff --git a/samples/text/text.cpp b/samples/text/text.cpp index 61eab09b2e..bf9b9dc253 100644 --- a/samples/text/text.cpp +++ b/samples/text/text.cpp @@ -43,6 +43,7 @@ #include "wx/colordlg.h" #include "wx/fontdlg.h" #include "wx/numdlg.h" +#include "wx/tokenzr.h" //---------------------------------------------------------------------- // class definitions @@ -296,7 +297,12 @@ public: void OnSetText(wxCommandEvent& WXUNUSED(event)) { - m_panel->m_text->SetValue(_T("Hello, world (what else did you expect)?")); + m_panel->m_text->SetValue(_T("Hello, world! (what else did you expect?)")); + } + + void OnChangeText(wxCommandEvent& WXUNUSED(event)) + { + m_panel->m_text->ChangeValue(_T("Changed, not set: no event")); } void OnIdle( wxIdleEvent& event ); @@ -348,6 +354,7 @@ public: void OnChangeBackgroundColour(wxCommandEvent& event); void OnLeftIndent(wxCommandEvent& event); void OnRightIndent(wxCommandEvent& event); + void OnTabStops(wxCommandEvent& event); private: wxTextCtrl *m_textCtrl; @@ -403,6 +410,7 @@ enum TEXT_REPLACE, TEXT_SELECT, TEXT_SET, + TEXT_CHANGE, // log menu TEXT_LOG_KEY, @@ -417,6 +425,9 @@ enum bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main frame window MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("Text wxWidgets sample"), 50, 50, 700, 550); @@ -468,6 +479,7 @@ bool MyApp::OnInit() menuText->Append(TEXT_REPLACE, _T("&Replace characters 4 to 8 with ABC\tCtrl-R")); menuText->Append(TEXT_SELECT, _T("&Select characters 4 to 8\tCtrl-I")); menuText->Append(TEXT_SET, _T("&Set the first text zone value\tCtrl-E")); + menuText->Append(TEXT_CHANGE, _T("&Change the first text zone value\tShift-Ctrl-E")); menuText->AppendSeparator(); menuText->Append(TEXT_MOVE_ENDTEXT, _T("Move cursor to the end of &text")); menuText->Append(TEXT_MOVE_ENDENTRY, _T("Move cursor to the end of &entry")); @@ -909,6 +921,10 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event) wxLogMessage(_T("Selection = '%s' (len = %u)"), sel.c_str(), (unsigned int) sel.length()); + + const wxString text = GetLineText(line); + wxLogMessage(_T("Current line: \"%s\"; length = %lu"), + text.c_str(), text.length()); } break; @@ -945,7 +961,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event) case WXK_F6: wxLogMessage(_T("IsModified() before SetValue(): %d"), IsModified()); - SetValue(_T("SetValue() has been called")); + ChangeValue(_T("ChangeValue() has been called")); wxLogMessage(_T("IsModified() after SetValue(): %d"), IsModified()); break; @@ -1024,7 +1040,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) // a little hack to use the command line argument for encoding testing if ( wxTheApp->argc == 2 ) { - switch ( wxTheApp->argv[1][0] ) + switch ( (wxChar)wxTheApp->argv[1][0] ) { case '2': m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL, @@ -1056,8 +1072,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_horizontal->AppendText(_T("Text in default encoding")); } - m_multitext = new MyTextCtrl( this, wxID_ANY, _T("Multi line."), - wxPoint(180,10), wxSize(200,70), wxTE_MULTILINE ); + m_multitext = new MyTextCtrl( this, wxID_ANY, + _T("Multi line without vertical scrollbar."), + wxPoint(180,10), wxSize(200,70), wxTE_MULTILINE | wxTE_NO_VSCROLL ); m_multitext->SetFont(*wxITALIC_FONT); (*m_multitext) << _T(" Appended."); m_multitext->SetInsertionPoint(0); @@ -1331,10 +1348,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TEXT_PAGE_DOWN, MyFrame::OnScrollPageDown) EVT_MENU(TEXT_PAGE_UP, MyFrame::OnScrollPageUp) - EVT_MENU(TEXT_GET_LINE, MyFrame::OnGetLine) - EVT_MENU(TEXT_GET_LINELENGTH, MyFrame::OnGetLineLength) + EVT_MENU(TEXT_GET_LINE, MyFrame::OnGetLine) + EVT_MENU(TEXT_GET_LINELENGTH, MyFrame::OnGetLineLength) EVT_MENU(TEXT_SET, MyFrame::OnSetText) + EVT_MENU(TEXT_CHANGE, MyFrame::OnChangeText) EVT_IDLE(MyFrame::OnIdle) END_EVENT_TABLE() @@ -1513,7 +1531,8 @@ enum RICHTEXT_CHANGE_TEXT_COLOUR, RICHTEXT_CHANGE_BACKGROUND_COLOUR, RICHTEXT_LEFT_INDENT, - RICHTEXT_RIGHT_INDENT + RICHTEXT_RIGHT_INDENT, + RICHTEXT_TAB_STOPS }; BEGIN_EVENT_TABLE(RichTextFrame, wxFrame) @@ -1528,6 +1547,7 @@ BEGIN_EVENT_TABLE(RichTextFrame, wxFrame) EVT_MENU(RICHTEXT_CHANGE_BACKGROUND_COLOUR, RichTextFrame::OnChangeBackgroundColour) EVT_MENU(RICHTEXT_LEFT_INDENT, RichTextFrame::OnLeftIndent) EVT_MENU(RICHTEXT_RIGHT_INDENT, RichTextFrame::OnRightIndent) + EVT_MENU(RICHTEXT_TAB_STOPS, RichTextFrame::OnTabStops) END_EVENT_TABLE() RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title): @@ -1566,7 +1586,8 @@ RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title): editMenu->Append(RICHTEXT_CHANGE_BACKGROUND_COLOUR, _("Change Background Colour")); editMenu->AppendSeparator(); editMenu->Append(RICHTEXT_LEFT_INDENT, _("Left Indent")); - editMenu->Append(RICHTEXT_RIGHT_INDENT, _("Right indent")); + editMenu->Append(RICHTEXT_RIGHT_INDENT, _("Right Indent")); + editMenu->Append(RICHTEXT_TAB_STOPS, _("Tab Stops")); menuBar->Append(editMenu, _("Edit")); SetMenuBar(menuBar); @@ -1758,6 +1779,35 @@ void RichTextFrame::OnRightIndent(wxCommandEvent& WXUNUSED(event)) } } +void RichTextFrame::OnTabStops(wxCommandEvent& WXUNUSED(event)) +{ + wxString tabsStr = wxGetTextFromUser + ( + _("Please enter the tab stop positions in tenths of a millimetre, separated by spaces.\nLeave empty to reset tab stops."), + _("Tab Stops"), + wxEmptyString, + this + ); + + wxArrayInt tabs; + + wxStringTokenizer tokens(tabsStr, _T(" ")); + while (tokens.HasMoreTokens()) + { + wxString token = tokens.GetNextToken(); + tabs.Add(wxAtoi(token)); + } + + wxTextAttr attr; + attr.SetTabs(tabs); + + long start, end; + m_textCtrl->GetSelection(& start, & end); + m_textCtrl->SetStyle(start, end, attr); + + m_currentPosition = -1; +} + void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) { long insertionPoint = m_textCtrl->GetInsertionPoint(); @@ -1782,10 +1832,9 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) alignment = wxT("left-aligned"); else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_JUSTIFIED) alignment = wxT("justified"); - msg.Printf(wxT("Facename: %s, wxColour(%d, %d, %d), %s"), - (const wxChar*) facename, + msg.Printf( "Facename: %s, wxColour(%d, %d, %d), %s", facename, attr.GetTextColour().Red(), attr.GetTextColour().Green(), attr.GetTextColour().Blue(), - (const wxChar*) alignment); + alignment ); if (attr.HasFont()) {