X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae25e5cc8c7d538190079056b1778b7edc5e04ec..e328812d748d2db49440a5fcf3ef9d3a49edbd56:/samples/text/text.cpp diff --git a/samples/text/text.cpp b/samples/text/text.cpp index ce57da1f3f..eacc38f47f 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 @@ -70,9 +71,14 @@ public: void OnChar(wxKeyEvent& event); void OnText(wxCommandEvent& event); + void OnTextEnter(wxCommandEvent& event); void OnTextURL(wxTextUrlEvent& event); void OnTextMaxLen(wxCommandEvent& event); + void OnTextCut(wxClipboardTextEvent & event); + void OnTextCopy(wxClipboardTextEvent & event); + void OnTextPaste(wxClipboardTextEvent & event); + void OnMouseEvent(wxMouseEvent& event); void OnSetFocus(wxFocusEvent& event); @@ -83,10 +89,13 @@ public: static bool ms_logMouse; static bool ms_logText; static bool ms_logFocus; + static bool ms_logClip; private: static inline wxChar GetChar(bool on, wxChar c) { return on ? c : _T('-'); } + void LogKeyEvent(const wxChar *name, wxKeyEvent& event) const; + void LogClipEvent(const wxChar *what, wxClipboardTextEvent& event); bool m_hasCapture; @@ -97,10 +106,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,7 +124,13 @@ public: void DoMoveToEndOfText(); void DoMoveToEndOfEntry(); - void OnSize( wxSizeEvent &event ); + // return true if currently text control has any selection + bool HasSelection() const + { + long from, to; + GetFocusedText()->GetSelection(&from, &to); + return from != to; + } MyTextCtrl *m_text; MyTextCtrl *m_password; @@ -135,11 +150,10 @@ public: #endif // wxUSE_LOG 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() + // get the currently focused text control or return the default one + // (m_multitext) is no text ctrl has focus -- in any case, returns + // something non NULL + wxTextCtrl *GetFocusedText() const; }; class MyFrame: public wxFrame @@ -156,9 +170,27 @@ public: #if wxUSE_CLIPBOARD void OnPasteFromClipboard( wxCommandEvent& WXUNUSED(event) ) - { m_panel->DoPasteFromClipboard(); } + { + wxLogMessage(_T("Pasting text from clipboard.")); + m_panel->DoPasteFromClipboard(); + } void OnCopyToClipboard( wxCommandEvent& WXUNUSED(event) ) - { m_panel->DoCopyToClipboard(); } + { + wxLogMessage(_T("Copying text to clipboard.")); + m_panel->DoCopyToClipboard(); + } + + void OnUpdatePasteFromClipboard(wxUpdateUIEvent& event) + { + wxClipboardLocker lockClip; + + event.Enable( wxTheClipboard->IsSupported(wxDF_TEXT) ); + } + + void OnUpdateCopyToClipboard(wxUpdateUIEvent& event) + { + event.Enable( m_panel->HasSelection() ); + } #endif // wxUSE_CLIPBOARD void OnAddTextFreeze( wxCommandEvent& WXUNUSED(event) ) @@ -200,13 +232,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 +247,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)) ); @@ -257,6 +289,11 @@ public: MyTextCtrl::ms_logFocus = event.IsChecked(); } + void OnLogClip(wxCommandEvent& event) + { + MyTextCtrl::ms_logClip = event.IsChecked(); + } + void OnSetText(wxCommandEvent& WXUNUSED(event)) { m_panel->m_text->SetValue(_T("Hello, world (what else did you expect)?")); @@ -331,9 +368,9 @@ IMPLEMENT_APP(MyApp) enum { - TEXT_QUIT = 100, - TEXT_ABOUT, - TEXT_LOAD, + TEXT_QUIT = wxID_EXIT, + TEXT_ABOUT = wxID_ABOUT, + TEXT_LOAD = 101, TEXT_SAVE, TEXT_CLEAR, TEXT_RICH_TEXT_TEST, @@ -341,6 +378,7 @@ enum // clipboard menu TEXT_CLIPBOARD_COPY = 200, TEXT_CLIPBOARD_PASTE, + TEXT_CLIPBOARD_VETO, // tooltip menu TEXT_TOOLTIPS_SETDELAY = 300, @@ -357,10 +395,10 @@ enum TEXT_LINE_UP, TEXT_PAGE_DOWN, TEXT_PAGE_UP, - + TEXT_GET_LINE, TEXT_GET_LINELENGTH, - + TEXT_REMOVE, TEXT_REPLACE, TEXT_SELECT, @@ -372,6 +410,7 @@ enum TEXT_LOG_MOUSE, TEXT_LOG_TEXT, TEXT_LOG_FOCUS, + TEXT_LOG_CLIP, TEXT_END }; @@ -380,7 +419,7 @@ bool MyApp::OnInit() { // Create the main frame window MyFrame *frame = new MyFrame((wxFrame *) NULL, - _T("Text wxWidgets sample"), 50, 50, 700, 420); + _T("Text wxWidgets sample"), 50, 50, 700, 550); frame->SetSizeHints( 500, 400 ); wxMenu *file_menu = new wxMenu; @@ -409,11 +448,16 @@ bool MyApp::OnInit() #endif // wxUSE_TOOLTIPS #if wxUSE_CLIPBOARD + // notice that we use non default accelerators on purpose here to compare + // their behaviour with the built in handling of standard Ctrl/Cmd-C/V wxMenu *menuClipboard = new wxMenu; - menuClipboard->Append(TEXT_CLIPBOARD_COPY, _T("&Copy\tCtrl-C"), - _T("Copy the first line to the clipboard")); - menuClipboard->Append(TEXT_CLIPBOARD_PASTE, _T("&Paste\tCtrl-V"), + menuClipboard->Append(TEXT_CLIPBOARD_COPY, _T("&Copy\tCtrl-Shift-C"), + _T("Copy the selection to the clipboard")); + menuClipboard->Append(TEXT_CLIPBOARD_PASTE, _T("&Paste\tCtrl-Shift-V"), _T("Paste from clipboard to the text control")); + menuClipboard->AppendSeparator(); + menuClipboard->AppendCheckItem(TEXT_CLIPBOARD_VETO, _T("Vet&o\tCtrl-Shift-O"), + _T("Veto all clipboard operations")); menu_bar->Append(menuClipboard, _T("&Clipboard")); #endif // wxUSE_CLIPBOARD @@ -448,19 +492,19 @@ bool MyApp::OnInit() menuLog->AppendCheckItem(TEXT_LOG_MOUSE, _T("Log &mouse events")); menuLog->AppendCheckItem(TEXT_LOG_TEXT, _T("Log &text events")); menuLog->AppendCheckItem(TEXT_LOG_FOCUS, _T("Log &focus events")); + menuLog->AppendCheckItem(TEXT_LOG_CLIP, _T("Log clip&board 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_logClip = 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 @@ -484,8 +528,12 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl) EVT_CHAR(MyTextCtrl::OnChar) EVT_TEXT(wxID_ANY, MyTextCtrl::OnText) + EVT_TEXT_ENTER(wxID_ANY, MyTextCtrl::OnTextEnter) EVT_TEXT_URL(wxID_ANY, MyTextCtrl::OnTextURL) EVT_TEXT_MAXLEN(wxID_ANY, MyTextCtrl::OnTextMaxLen) + EVT_TEXT_CUT(wxID_ANY, MyTextCtrl::OnTextCut) + EVT_TEXT_COPY(wxID_ANY, MyTextCtrl::OnTextCopy) + EVT_TEXT_PASTE(wxID_ANY, MyTextCtrl::OnTextPaste) EVT_MOUSE_EVENTS(MyTextCtrl::OnMouseEvent) @@ -498,6 +546,7 @@ bool MyTextCtrl::ms_logChar = false; bool MyTextCtrl::ms_logMouse = false; bool MyTextCtrl::ms_logText = false; bool MyTextCtrl::ms_logFocus = false; +bool MyTextCtrl::ms_logClip = false; void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const { @@ -524,8 +573,6 @@ void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const case WXK_MENU: key = _T("MENU"); break; case WXK_PAUSE: key = _T("PAUSE"); break; case WXK_CAPITAL: key = _T("CAPITAL"); break; - case WXK_PRIOR: key = _T("PRIOR"); break; - case WXK_NEXT: key = _T("NEXT"); break; case WXK_END: key = _T("END"); break; case WXK_HOME: key = _T("HOME"); break; case WXK_LEFT: key = _T("LEFT"); break; @@ -594,7 +641,6 @@ void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const case WXK_NUMPAD_UP: key = _T("NUMPAD_UP"); break; case WXK_NUMPAD_RIGHT: key = _T("NUMPAD_RIGHT"); break; case WXK_NUMPAD_DOWN: key = _T("NUMPAD_DOWN"); break; - case WXK_NUMPAD_PRIOR: key = _T("NUMPAD_PRIOR"); break; case WXK_NUMPAD_PAGEUP: key = _T("NUMPAD_PAGEUP"); break; case WXK_NUMPAD_PAGEDOWN: key = _T("NUMPAD_PAGEDOWN"); break; case WXK_NUMPAD_END: key = _T("NUMPAD_END"); break; @@ -731,6 +777,25 @@ void MyTextCtrl::OnKillFocus(wxFocusEvent& event) } void MyTextCtrl::OnText(wxCommandEvent& event) +{ + if ( !ms_logText ) + return; + + MyTextCtrl *win = (MyTextCtrl *)event.GetEventObject(); + const wxChar *changeVerb = win->IsModified() ? _T("changed") + : _T("set by program"); + const wxChar *data = (const wxChar *)(win->GetClientData()); + if ( data ) + { + wxLogMessage(_T("Text %s in control \"%s\""), changeVerb, data); + } + else + { + wxLogMessage(_T("Text %s in some control"), changeVerb); + } +} + +void MyTextCtrl::OnTextEnter(wxCommandEvent& event) { if ( !ms_logText ) return; @@ -739,12 +804,11 @@ void MyTextCtrl::OnText(wxCommandEvent& event) const wxChar *data = (const wxChar *)(win->GetClientData()); if ( data ) { - wxLogMessage(_T("Text changed in control '%s'"), data); + wxLogMessage(_T("Enter pressed in control '%s'"), data); } else { - // wxLogMessage( event.GetString() ); - wxLogMessage(_T("Text changed in some control")); + wxLogMessage(_T("Enter pressed in some control")); } } @@ -753,6 +817,39 @@ void MyTextCtrl::OnTextMaxLen(wxCommandEvent& WXUNUSED(event)) wxLogMessage(_T("You can't enter more characters into this control.")); } + +void MyTextCtrl::OnTextCut(wxClipboardTextEvent& event) +{ + LogClipEvent(_T("cut to"), event); +} + +void MyTextCtrl::OnTextCopy(wxClipboardTextEvent& event) +{ + LogClipEvent(_T("copied to"), event); +} + +void MyTextCtrl::OnTextPaste(wxClipboardTextEvent& event) +{ + LogClipEvent(_T("pasted from"), event); +} + +void MyTextCtrl::LogClipEvent(const wxChar *what, wxClipboardTextEvent& event) +{ + wxFrame *frame = wxDynamicCast(wxGetTopLevelParent(this), wxFrame); + wxCHECK_RET( frame, _T("no parent frame?") ); + + const bool veto = frame->GetMenuBar()->IsChecked(TEXT_CLIPBOARD_VETO); + if ( !veto ) + event.Skip(); + + if ( ms_logClip ) + { + wxLogMessage(_T("Text %s%s the clipboard."), + veto ? _T("not ") : _T(""), what); + } +} + + void MyTextCtrl::OnTextURL(wxTextUrlEvent& event) { const wxMouseEvent& ev = event.GetMouseEvent(); @@ -882,10 +979,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) ) { @@ -932,14 +1025,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL, false, _T(""), wxFONTENCODING_ISO8859_2)); - m_horizontal->AppendText(_T("®lu»ouèký kùò zbìsile èe¹tina «»")); + m_horizontal->AppendText(_T("\256lu\273ou\350k\375 k\371\362 zb\354sile \350e\271tina \253\273")); break; case '1': m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL, false, _T(""), wxFONTENCODING_CP1251)); - m_horizontal->AppendText(_T("Ïðèâåò!")); + m_horizontal->AppendText(_T("\317\360\350\342\345\362!")); break; case '8': @@ -949,7 +1042,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #if wxUSE_UNICODE m_horizontal->AppendText(L"\x0412\x0430\x0434\x0438\x043c \x0426"); #else - m_horizontal->AppendText("ËÁÖÅÔÓÑ ÕÄÁÞÎÙÍ"); + m_horizontal->AppendText("\313\301\326\305\324\323\321 \325\304\301\336\316\331\315"); #endif } } @@ -959,7 +1052,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) } m_multitext = new MyTextCtrl( this, wxID_ANY, _T("Multi line."), - wxPoint(180,10), wxSize(240,70), wxTE_MULTILINE ); + wxPoint(180,10), wxSize(200,70), wxTE_MULTILINE ); m_multitext->SetFont(*wxITALIC_FONT); (*m_multitext) << _T(" Appended."); m_multitext->SetInsertionPoint(0); @@ -972,20 +1065,22 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #endif m_tab = new MyTextCtrl( this, 100, _T("Multiline, allow processing."), - wxPoint(180,90), wxSize(240,70), wxTE_MULTILINE | wxTE_PROCESS_TAB ); + wxPoint(180,90), wxSize(200,70), wxTE_MULTILINE | wxTE_PROCESS_TAB ); m_tab->SetClientData((void *)_T("tab")); m_enter = new MyTextCtrl( this, 100, _T("Multiline, allow processing."), - wxPoint(180,170), wxSize(240,70), wxTE_MULTILINE); + wxPoint(180,170), wxSize(200,70), wxTE_MULTILINE); m_enter->SetClientData((void *)_T("enter")); m_textrich = new MyTextCtrl(this, wxID_ANY, _T("Allows more than 30Kb of text\n") _T("(even under broken Win9x)\n") _T("and a very very very very very ") _T("very very very long line to test ") - _T("wxHSCROLL style"), - wxPoint(450, 10), wxSize(230, 230), - wxTE_RICH | wxTE_MULTILINE); + _T("wxHSCROLL style\n") + _T("\nAnd here is a link in quotation marks to ") + _T("test wxTE_AUTO_URL: \"http://www.wxwidgets.org\""), + wxPoint(450, 10), wxSize(200, 230), + wxTE_RICH | wxTE_MULTILINE | wxTE_AUTO_URL); m_textrich->SetStyle(0, 10, *wxRED); m_textrich->SetStyle(10, 20, *wxBLUE); m_textrich->SetStyle(30, 40, @@ -1001,11 +1096,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,43 +1110,28 @@ 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) +wxTextCtrl *MyPanel::GetFocusedText() const { wxWindow *win = FindFocus(); wxTextCtrl *text = win ? wxDynamicCast(win, wxTextCtrl) : NULL; - return text ? text : textDef; + return text ? text : m_multitext; } #if wxUSE_CLIPBOARD @@ -1087,7 +1169,7 @@ void MyPanel::DoPasteFromClipboard() #if wxUSE_LOG *m_log << _T("Successfully retrieved data from the clipboard.\n"); #endif // wxUSE_LOG - *m_multitext << data.GetText() << _T("\n"); + GetFocusedText()->AppendText(data.GetText()); } else { @@ -1117,7 +1199,7 @@ void MyPanel::DoCopyToClipboard() // call has no effect under MSW. wxTheClipboard->UsePrimarySelection(); - wxString text( m_multitext->GetLineText(0) ); + wxString text( GetFocusedText()->GetStringSelection() ); if (text.IsEmpty()) { @@ -1181,17 +1263,17 @@ void MyPanel::DoMoveToEndOfEntry() void MyPanel::DoRemoveText() { - GetFocusedText(m_multitext)->Remove(0, 10); + GetFocusedText()->Remove(0, 10); } void MyPanel::DoReplaceText() { - GetFocusedText(m_multitext)->Replace(3, 8, _T("ABC")); + GetFocusedText()->Replace(3, 8, _T("ABC")); } void MyPanel::DoSelectText() { - GetFocusedText(m_multitext)->SetSelection(3, 8); + GetFocusedText()->SetSelection(3, 8); } //---------------------------------------------------------------------- @@ -1210,6 +1292,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TEXT_LOG_MOUSE,MyFrame::OnLogMouse) EVT_MENU(TEXT_LOG_TEXT, MyFrame::OnLogText) EVT_MENU(TEXT_LOG_FOCUS,MyFrame::OnLogFocus) + EVT_MENU(TEXT_LOG_CLIP, MyFrame::OnLogClip) #if wxUSE_LOG EVT_MENU(TEXT_CLEAR, MyFrame::OnLogClear) #endif // wxUSE_LOG @@ -1222,6 +1305,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if wxUSE_CLIPBOARD EVT_MENU(TEXT_CLIPBOARD_PASTE, MyFrame::OnPasteFromClipboard) EVT_MENU(TEXT_CLIPBOARD_COPY, MyFrame::OnCopyToClipboard) + + EVT_UPDATE_UI(TEXT_CLIPBOARD_PASTE, MyFrame::OnUpdatePasteFromClipboard) + EVT_UPDATE_UI(TEXT_CLIPBOARD_COPY, MyFrame::OnUpdateCopyToClipboard) #endif // wxUSE_CLIPBOARD EVT_MENU(TEXT_REMOVE, MyFrame::OnRemoveText) @@ -1552,7 +1638,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 +1654,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 +1667,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 +1683,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 +1696,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 +1720,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 +1744,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 +1781,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