Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed context menu in wxRichTextCtrl

Browse Source 
Added colour change event handler to wxRichTextCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-10-27 16:59:24 +00:00
parent 6103234e25
commit 52170c5b44
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/richtext/richtextctrl.h
View File

@@ -582,6 +582,7 @@ public:
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event);
void OnDropFiles(wxDropFilesEvent& event); void OnDropFiles(wxDropFilesEvent& event);
void OnCaptureLost(wxMouseCaptureLostEvent& event); void OnCaptureLost(wxMouseCaptureLostEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
void OnCut(wxCommandEvent& event); void OnCut(wxCommandEvent& event);
void OnCopy(wxCommandEvent& event); void OnCopy(wxCommandEvent& event);

18
src/richtext/richtextctrl.cpp
View File

@@ -76,6 +76,7 @@ BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
EVT_KILL_FOCUS(wxRichTextCtrl::OnKillFocus) EVT_KILL_FOCUS(wxRichTextCtrl::OnKillFocus)
EVT_MOUSE_CAPTURE_LOST(wxRichTextCtrl::OnCaptureLost) EVT_MOUSE_CAPTURE_LOST(wxRichTextCtrl::OnCaptureLost)
EVT_CONTEXT_MENU(wxRichTextCtrl::OnContextMenu) EVT_CONTEXT_MENU(wxRichTextCtrl::OnContextMenu)
EVT_SYS_COLOUR_CHANGED(wxRichTextCtrl::OnSysColourChanged)
EVT_MENU(wxID_UNDO, wxRichTextCtrl::OnUndo) EVT_MENU(wxID_UNDO, wxRichTextCtrl::OnUndo)
EVT_UPDATE_UI(wxID_UNDO, wxRichTextCtrl::OnUpdateUndo) EVT_UPDATE_UI(wxID_UNDO, wxRichTextCtrl::OnUpdateUndo)
@@ -506,7 +507,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
} }
/// Right-click /// Right-click
void wxRichTextCtrl::OnRightClick(wxMouseEvent& WXUNUSED(event)) void wxRichTextCtrl::OnRightClick(wxMouseEvent& event)
{ {
SetFocus(); SetFocus();
@@ -516,7 +517,8 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& WXUNUSED(event))
cmdEvent.SetEventObject(this); cmdEvent.SetEventObject(this);
cmdEvent.SetPosition(m_caretPosition+1); cmdEvent.SetPosition(m_caretPosition+1);
GetEventHandler()->ProcessEvent(cmdEvent); if (!GetEventHandler()->ProcessEvent(cmdEvent))
event.Skip();
} }
/// Left-double-click /// Left-double-click
@@ -3111,5 +3113,17 @@ void wxRichTextCtrl::ClearAvailableFontNames()
sm_availableFontNames.Clear(); sm_availableFontNames.Clear();
} }
void wxRichTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& event)
{
//wxLogDebug(wxT("wxRichTextCtrl::OnSysColourChanged"));
wxTextAttrEx basicStyle = GetBasicStyle();
basicStyle.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
SetBasicStyle(basicStyle);
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
Refresh();
}
#endif #endif
// wxUSE_RICHTEXT // wxUSE_RICHTEXT