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

Add option to STC example to select drawing technology

Browse Source
This commit is contained in:
Maarten Bent
2020-05-31 23:42:33 +02:00
parent 0195d82832
commit a500c60feb
4 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/stc/defsext.h
View File

@@ -70,6 +70,8 @@ enum {
myID_MULTIPLE_SELECTIONS, myID_MULTIPLE_SELECTIONS,
myID_MULTI_PASTE, myID_MULTI_PASTE,
myID_MULTIPLE_SELECTIONS_TYPING, myID_MULTIPLE_SELECTIONS_TYPING,
myID_TECHNOLOGY_DEFAULT,
myID_TECHNOLOGY_DIRECTWRITE,
myID_CUSTOM_POPUP, myID_CUSTOM_POPUP,
myID_USECHARSET, myID_USECHARSET,
myID_CHARSETANSI, myID_CHARSETANSI,

7
samples/stc/edit.cpp
View File

@@ -128,6 +128,8 @@ wxBEGIN_EVENT_TABLE (Edit, wxStyledTextCtrl)
EVT_MENU(myID_MULTI_PASTE, Edit::OnMultiPaste) EVT_MENU(myID_MULTI_PASTE, Edit::OnMultiPaste)
EVT_MENU(myID_MULTIPLE_SELECTIONS_TYPING, Edit::OnMultipleSelectionsTyping) EVT_MENU(myID_MULTIPLE_SELECTIONS_TYPING, Edit::OnMultipleSelectionsTyping)
EVT_MENU(myID_CUSTOM_POPUP, Edit::OnCustomPopup) EVT_MENU(myID_CUSTOM_POPUP, Edit::OnCustomPopup)
EVT_MENU(myID_TECHNOLOGY_DEFAULT, Edit::OnTechnology)
EVT_MENU(myID_TECHNOLOGY_DIRECTWRITE, Edit::OnTechnology)
// stc // stc
EVT_STC_MARGINCLICK (wxID_ANY, Edit::OnMarginClick) EVT_STC_MARGINCLICK (wxID_ANY, Edit::OnMarginClick)
EVT_STC_CHARADDED (wxID_ANY, Edit::OnCharAdded) EVT_STC_CHARADDED (wxID_ANY, Edit::OnCharAdded)
@@ -480,6 +482,11 @@ void Edit::OnCustomPopup(wxCommandEvent& evt)
UsePopUp(evt.IsChecked() ? wxSTC_POPUP_NEVER : wxSTC_POPUP_ALL); UsePopUp(evt.IsChecked() ? wxSTC_POPUP_NEVER : wxSTC_POPUP_ALL);
} }
void Edit::OnTechnology(wxCommandEvent& event)
{
SetTechnology(event.GetId() == myID_TECHNOLOGY_DIRECTWRITE ? wxSTC_TECHNOLOGY_DIRECTWRITE : wxSTC_TECHNOLOGY_DEFAULT);
}
//! misc //! misc
void Edit::OnMarginClick (wxStyledTextEvent &event) { void Edit::OnMarginClick (wxStyledTextEvent &event) {
if (event.GetMargin() == 2) { if (event.GetMargin() == 2) {

1
samples/stc/edit.h
View File

@@ -102,6 +102,7 @@ public:
void OnMultiPaste(wxCommandEvent& event); void OnMultiPaste(wxCommandEvent& event);
void OnMultipleSelectionsTyping(wxCommandEvent& event); void OnMultipleSelectionsTyping(wxCommandEvent& event);
void OnCustomPopup(wxCommandEvent& evt); void OnCustomPopup(wxCommandEvent& evt);
void OnTechnology(wxCommandEvent& event);
// stc // stc
void OnMarginClick (wxStyledTextEvent &event); void OnMarginClick (wxStyledTextEvent &event);
void OnCharAdded (wxStyledTextEvent &event); void OnCharAdded (wxStyledTextEvent &event);

9
samples/stc/stctest.cpp
View File

@@ -572,7 +572,14 @@ void AppFrame::CreateMenu ()
menuExtra->AppendCheckItem(myID_MULTI_PASTE, _("Toggle multi-&paste")); menuExtra->AppendCheckItem(myID_MULTI_PASTE, _("Toggle multi-&paste"));
menuExtra->AppendCheckItem(myID_MULTIPLE_SELECTIONS_TYPING, _("Toggle t&yping on multiple selections")); menuExtra->AppendCheckItem(myID_MULTIPLE_SELECTIONS_TYPING, _("Toggle t&yping on multiple selections"));
menuExtra->AppendSeparator(); menuExtra->AppendSeparator();
menuExtra->AppendCheckItem (myID_CUSTOM_POPUP, _("C&ustom popup menu")); #if defined(__WXMSW__) && wxUSE_GRAPHICS_DIRECT2D
wxMenu* menuTechnology = new wxMenu;
menuTechnology->AppendRadioItem(myID_TECHNOLOGY_DEFAULT, _("&Default"));
menuTechnology->AppendRadioItem(myID_TECHNOLOGY_DIRECTWRITE, _("Direct&Write"));
menuExtra->AppendSubMenu(menuTechnology, _("&Technology"));
menuExtra->AppendSeparator();
#endif
menuExtra->AppendCheckItem (myID_CUSTOM_POPUP, _("C&ustom context menu"));
// Window menu // Window menu
wxMenu *menuWindow = new wxMenu; wxMenu *menuWindow = new wxMenu;