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

Add "Apply" button to the font sample

Browse Source 
Live changes don't work correctly in all ports, notably wxQt, which
doesn't seem to generate the events correctly for wxSpinCtrl, so add a
button to apply the changes.

This could be seen as a better UI anyhow.
This commit is contained in:
Vadim Zeitlin
2018-09-14 17:29:33 +02:00
parent 2d8decd7f4
commit d002acfec6
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/font/font.cpp
View File

@@ -229,7 +229,7 @@ public:
void OnSetEncoding(wxCommandEvent& event); void OnSetEncoding(wxCommandEvent& event);
void OnPrivateFont(wxCommandEvent& event); void OnPrivateFont(wxCommandEvent& event);
void OnFontPanelChange(wxCommandEvent& WXUNUSED(event)) void OnFontPanelApply(wxCommandEvent& WXUNUSED(event))
{ DoChangeFont(m_fontWindow->MakeNewFont()); } { DoChangeFont(m_fontWindow->MakeNewFont()); }
protected: protected:
@@ -543,11 +543,7 @@ MyFrame::MyFrame()
m_fontWindow = new FontWindow(splitter); m_fontWindow = new FontWindow(splitter);
m_fontWindow->Bind(wxEVT_CHECKBOX, &MyFrame::OnFontPanelChange, this); m_fontWindow->Bind(wxEVT_BUTTON, &MyFrame::OnFontPanelApply, this);
m_fontWindow->Bind(wxEVT_CHOICE, &MyFrame::OnFontPanelChange, this);
m_fontWindow->Bind(wxEVT_TEXT_ENTER, &MyFrame::OnFontPanelChange, this);
m_fontWindow->Bind(wxEVT_SPINCTRL, &MyFrame::OnFontPanelChange, this);
m_fontWindow->Bind(wxEVT_SPINCTRLDOUBLE, &MyFrame::OnFontPanelChange, this);
m_textctrl = new wxTextCtrl(splitter, wxID_ANY, m_textctrl = new wxTextCtrl(splitter, wxID_ANY,
wxT("Paste text here to see how it looks\nlike in the given font"), wxT("Paste text here to see how it looks\nlike in the given font"),
@@ -1333,9 +1329,10 @@ FontPanel::FontPanel(wxWindow* parent)
sizer->Add(new wxStaticText(this, wxID_ANY, "Fixed width:"), flagsLabel); sizer->Add(new wxStaticText(this, wxID_ANY, "Fixed width:"), flagsLabel);
sizer->Add(m_checkFixedWidth, flagsValue); sizer->Add(m_checkFixedWidth, flagsValue);
wxSizer* const sizerTop = new wxBoxSizer(wxVERTICAL); wxSizer* const sizerTop = new wxBoxSizer(wxVERTICAL);
sizerTop->Add(sizer, wxSizerFlags().Expand().Border(wxBOTTOM)); sizerTop->Add(sizer, wxSizerFlags().Expand().Border(wxBOTTOM));
sizerTop->Add(new wxButton(this, wxID_APPLY, "&Apply changes"),
wxSizerFlags().Border(wxBOTTOM).Centre());
sizerTop->Add(m_labelInfo, wxSizerFlags().Expand().Border(wxTOP)); sizerTop->Add(m_labelInfo, wxSizerFlags().Expand().Border(wxTOP));
SetSizer(sizerTop); SetSizer(sizerTop);