X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/953902913473763f359bc0fe7d81c88f7da3e184..a8d08dbd459c1b7be9c1d82d9a78a32ae2730d86:/samples/text/text.cpp diff --git a/samples/text/text.cpp b/samples/text/text.cpp index 7c2431edf1..8ae237b1dd 100644 --- a/samples/text/text.cpp +++ b/samples/text/text.cpp @@ -97,10 +97,10 @@ class MyPanel: public wxPanel { public: MyPanel(wxFrame *frame, int x, int y, int w, int h); - virtual ~MyPanel() - { + virtual ~MyPanel() + { #if wxUSE_LOG - delete wxLog::SetActiveTarget(m_logOld); + delete wxLog::SetActiveTarget(m_logOld); #endif // wxUSE_LOG } @@ -201,6 +201,27 @@ public: wxLogMessage(_T("Already at the top")); } + void OnGetLine(wxCommandEvent& WXUNUSED(event)) + { + long nLine = wxGetNumberFromUser(wxT("Which line would you like to get?"), + wxT("Enter which line you would like to get"), + wxT("Get a line from the tabbed multiline text control") ); + + wxMessageBox(m_panel->m_tab->GetLineText(nLine)); + } + + void OnGetLineLength(wxCommandEvent& WXUNUSED(event)) + { + long nLine = wxGetNumberFromUser(wxT("Which line would you like to get?"), + wxT("Enter which line you would like to get"), + wxT("Get length of a line from the tabbed multiline text control") ); + + wxMessageBox(wxString::Format(wxT("Length of line %i is:%i"), + (int) nLine, + m_panel->m_tab->GetLineLength(nLine)) + ); + } + #if wxUSE_LOG void OnLogClear(wxCommandEvent& event); #endif // wxUSE_LOG @@ -336,6 +357,10 @@ enum TEXT_LINE_UP, TEXT_PAGE_DOWN, TEXT_PAGE_UP, + + TEXT_GET_LINE, + TEXT_GET_LINELENGTH, + TEXT_REMOVE, TEXT_REPLACE, TEXT_SELECT, @@ -410,7 +435,10 @@ bool MyApp::OnInit() menuText->Append(TEXT_LINE_DOWN, _T("Scroll text one line down")); menuText->Append(TEXT_LINE_UP, _T("Scroll text one line up")); menuText->Append(TEXT_PAGE_DOWN, _T("Scroll text one page down")); - menuText->Append(TEXT_PAGE_DOWN, _T("Scroll text one page up")); + menuText->Append(TEXT_PAGE_UP, _T("Scroll text one page up")); + menuText->AppendSeparator(); + menuText->Append(TEXT_GET_LINE, _T("Get the text of a line of the tabbed multiline")); + menuText->Append(TEXT_GET_LINELENGTH, _T("Get the length of a line of the tabbed multiline")); menu_bar->Append(menuText, _T("Te&xt")); #if wxUSE_LOG @@ -772,7 +800,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event) line, column, (long) GetNumberOfLines(), (long) GetLineLength(line), - GetValue().length(), + (unsigned int) GetValue().length(), GetLastPosition()); long from, to; @@ -782,7 +810,8 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event) wxLogMessage(_T("Selection: from %ld to %ld."), from, to); wxLogMessage(_T("Selection = '%s' (len = %u)"), - sel.c_str(), sel.length()); + sel.c_str(), + (unsigned int) sel.length()); } break; @@ -1211,6 +1240,9 @@ 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_SET, MyFrame::OnSetText) EVT_IDLE(MyFrame::OnIdle) @@ -1520,7 +1552,7 @@ void RichTextFrame::OnChangeFont(wxCommandEvent& WXUNUSED(event)) wxTextAttr attr; attr.SetFont(font); - + long start, end; m_textCtrl->GetSelection(& start, & end); m_textCtrl->SetStyle(start, end, attr); @@ -1536,7 +1568,7 @@ void RichTextFrame::OnChangeTextColour(wxCommandEvent& WXUNUSED(event)) data.SetChooseFull(true); for (int i = 0; i < 16; i++) { - wxColour colour(i*16, i*16, i*16); + wxColour colour((unsigned char)(i*16), (unsigned char)(i*16), (unsigned char)(i*16)); data.SetCustomColour(i, colour); } @@ -1549,7 +1581,7 @@ void RichTextFrame::OnChangeTextColour(wxCommandEvent& WXUNUSED(event)) wxTextAttr attr; attr.SetTextColour(col); - + long start, end; m_textCtrl->GetSelection(& start, & end); m_textCtrl->SetStyle(start, end, attr); @@ -1565,7 +1597,7 @@ void RichTextFrame::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event)) data.SetChooseFull(true); for (int i = 0; i < 16; i++) { - wxColour colour(i*16, i*16, i*16); + wxColour colour((unsigned char)(i*16), (unsigned char)(i*16), (unsigned char)(i*16)); data.SetCustomColour(i, colour); } @@ -1578,7 +1610,7 @@ void RichTextFrame::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event)) wxTextAttr attr; attr.SetBackgroundColour(col); - + long start, end; m_textCtrl->GetSelection(& start, & end); m_textCtrl->SetStyle(start, end, attr); @@ -1602,7 +1634,7 @@ void RichTextFrame::OnLeftIndent(wxCommandEvent& WXUNUSED(event)) wxTextAttr attr; attr.SetLeftIndent(indent); - + long start, end; m_textCtrl->GetSelection(& start, & end); m_textCtrl->SetStyle(start, end, attr); @@ -1626,7 +1658,7 @@ void RichTextFrame::OnRightIndent(wxCommandEvent& WXUNUSED(event)) wxTextAttr attr; attr.SetRightIndent(indent); - + long start, end; m_textCtrl->GetSelection(& start, & end); m_textCtrl->SetStyle(start, end, attr);