X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae25e5cc8c7d538190079056b1778b7edc5e04ec..c4e2838090992384911a6a6aa44cac985d79a555:/samples/text/text.cpp diff --git a/samples/text/text.cpp b/samples/text/text.cpp index ce57da1f3f..208279f592 100644 --- a/samples/text/text.cpp +++ b/samples/text/text.cpp @@ -42,6 +42,7 @@ #include "wx/colordlg.h" #include "wx/fontdlg.h" +#include "wx/numdlg.h" //---------------------------------------------------------------------- // class definitions @@ -97,10 +98,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 } @@ -115,8 +116,6 @@ public: void DoMoveToEndOfText(); void DoMoveToEndOfEntry(); - void OnSize( wxSizeEvent &event ); - MyTextCtrl *m_text; MyTextCtrl *m_password; MyTextCtrl *m_enter; @@ -138,8 +137,6 @@ private: // get the currently focused text control or return the default one is no // text ctrl has focus wxTextCtrl *GetFocusedText(wxTextCtrl *textDef); - - DECLARE_EVENT_TABLE() }; class MyFrame: public wxFrame @@ -200,13 +197,13 @@ public: if ( !m_panel->m_textrich->PageUp() ) 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)); } @@ -215,8 +212,8 @@ public: 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"), + + wxMessageBox(wxString::Format(wxT("Length of line %i is:%i"), (int) nLine, m_panel->m_tab->GetLineLength(nLine)) ); @@ -357,10 +354,10 @@ enum TEXT_LINE_UP, TEXT_PAGE_DOWN, TEXT_PAGE_UP, - + TEXT_GET_LINE, TEXT_GET_LINELENGTH, - + TEXT_REMOVE, TEXT_REPLACE, TEXT_SELECT, @@ -449,18 +446,18 @@ bool MyApp::OnInit() menuLog->AppendCheckItem(TEXT_LOG_TEXT, _T("Log &text events")); menuLog->AppendCheckItem(TEXT_LOG_FOCUS, _T("Log &focus events")); menuLog->AppendSeparator(); - menuLog->Append(TEXT_CLEAR, _T("&Clear the log\tCtrl-C"), + menuLog->Append(TEXT_CLEAR, _T("&Clear the log\tCtrl-L"), _T("Clear the log window contents")); // select only the interesting events by default - menuLog->Check(TEXT_LOG_KEY, true); - menuLog->Check(TEXT_LOG_CHAR, true); - menuLog->Check(TEXT_LOG_TEXT, true); - MyTextCtrl::ms_logKey = - MyTextCtrl::ms_logChar = + MyTextCtrl::ms_logChar = false; MyTextCtrl::ms_logText = true; + menuLog->Check(TEXT_LOG_KEY, MyTextCtrl::ms_logKey); + menuLog->Check(TEXT_LOG_CHAR, MyTextCtrl::ms_logChar); + menuLog->Check(TEXT_LOG_TEXT, MyTextCtrl::ms_logText); + menu_bar->Append(menuLog, _T("&Log")); #endif // wxUSE_LOG @@ -882,10 +879,6 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event) // MyPanel //---------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyPanel, wxPanel) - EVT_SIZE(MyPanel::OnSize) -END_EVENT_TABLE() - MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : wxPanel( frame, wxID_ANY, wxPoint(x, y), wxSize(w, h) ) { @@ -1001,11 +994,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_textrich->AppendText(_T("And this should be in blue and the text you ") _T("type should be in blue as well")); + + // lay out the controls wxBoxSizer *column1 = new wxBoxSizer(wxVERTICAL); - column1->Add( m_text, 0, wxALL, 10 ); - column1->Add( m_password, 0, wxALL, 10 ); - column1->Add( m_readonly, 0, wxALL, 10 ); - column1->Add( m_limited, 0, wxALL, 10 ); + column1->Add( m_text, 0, wxALL | wxEXPAND, 10 ); + column1->Add( m_password, 0, wxALL | wxEXPAND, 10 ); + column1->Add( m_readonly, 0, wxALL | wxEXPAND, 10 ); + column1->Add( m_limited, 0, wxALL | wxEXPAND, 10 ); column1->Add( m_horizontal, 1, wxALL | wxEXPAND, 10 ); wxBoxSizer *column2 = new wxBoxSizer(wxVERTICAL); @@ -1013,37 +1008,22 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) column2->Add( m_tab, 1, wxALL | wxEXPAND, 10 ); column2->Add( m_enter, 1, wxALL | wxEXPAND, 10 ); - wxBoxSizer *column3 = new wxBoxSizer(wxVERTICAL); - column3->Add( m_textrich, 1, wxALL | wxEXPAND, 10 ); - wxBoxSizer *row1 = new wxBoxSizer(wxHORIZONTAL); row1->Add( column1, 0, wxALL | wxEXPAND, 10 ); row1->Add( column2, 1, wxALL | wxEXPAND, 10 ); - row1->Add( column3, 1, wxALL | wxEXPAND, 10 ); + row1->Add( m_textrich, 1, wxALL | wxEXPAND, 10 ); wxBoxSizer *topSizer = new wxBoxSizer(wxVERTICAL); topSizer->Add( row1, 2, wxALL | wxEXPAND, 10 ); #if wxUSE_LOG - wxBoxSizer *row2 = new wxBoxSizer(wxHORIZONTAL); - row2->Add( m_log, 1, wxALL | wxEXPAND, 10 ); - topSizer->Add( row2, 1, wxALL | wxEXPAND, 10 ); + topSizer->Add( m_log, 1, wxALL | wxEXPAND, 10 ); #endif SetAutoLayout( true ); SetSizer(topSizer); } -void MyPanel::OnSize( wxSizeEvent &event ) -{ -#if wxUSE_LOG - wxSize client_area( GetClientSize() ); - if (m_log) - m_log->SetSize( 0, 260, client_area.x, client_area.y - 260 ); -#endif // wxUSE_LOG - event.Skip(); -} - wxTextCtrl *MyPanel::GetFocusedText(wxTextCtrl *textDef) { wxWindow *win = FindFocus(); @@ -1552,7 +1532,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); @@ -1568,7 +1548,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); } @@ -1581,7 +1561,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); @@ -1597,7 +1577,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); } @@ -1610,7 +1590,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); @@ -1634,7 +1614,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); @@ -1658,7 +1638,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); @@ -1695,6 +1675,21 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) (const wxChar*) facename, attr.GetTextColour().Red(), attr.GetTextColour().Green(), attr.GetTextColour().Blue(), (const wxChar*) alignment); + + if (attr.HasFont()) + { + if (attr.GetFont().GetWeight() == wxBOLD) + msg += wxT(" BOLD"); + else if (attr.GetFont().GetWeight() == wxNORMAL) + msg += wxT(" NORMAL"); + + if (attr.GetFont().GetStyle() == wxITALIC) + msg += wxT(" ITALIC"); + + if (attr.GetFont().GetUnderlined()) + msg += wxT(" UNDERLINED"); + } + SetStatusText(msg); } #endif // wxUSE_STATUSBAR