Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Cross update of composed and decomposed text controls fixed

Browse Source
This commit is contained in:
Simon Rozman 2016-02-08 14:57:46 +01:00
parent 21fa70a828
commit aad2b347a6
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ZRCola/zrcolacomppnl.cpp
View File

@ -24,7 +24,9 @@
// wxZRColaComposerPanel
//////////////////////////////////////////////////////////////////////////
wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) : wxZRColaComposerPanelBase(parent)
wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
m_progress(false),
wxZRColaComposerPanelBase(parent)
{
}
@ -36,17 +38,29 @@ wxZRColaComposerPanel::~wxZRColaComposerPanel()
void wxZRColaComposerPanel::OnDecomposedText(wxCommandEvent& event)
{
// TODO: Do the real ZRCola composition here.
m_composed->SetValue(m_decomposed->GetValue());
if (m_progress) {
// We are being updated by wxZRColaComposerPanel::OnComposedText()
event.Skip();
} else {
// TODO: Do the real ZRCola composition here.
m_progress = true;
m_composed->SetValue(m_decomposed->GetValue());
event.Skip();
m_progress = false;
}
}
void wxZRColaComposerPanel::OnComposedText(wxCommandEvent& event)
{
// TODO: Do the real ZRCola decomposition here.
m_decomposed->SetValue(m_composed->GetValue());
if (m_progress) {
// We are being updated by wxZRColaComposerPanel::OnDecomposedText()
event.Skip();
} else {
// TODO: Do the real ZRCola decomposition here.
m_progress = true;
m_decomposed->SetValue(m_composed->GetValue());
event.Skip();
m_progress = false;
}
}

3
ZRCola/zrcolacomppnl.h
View File

@ -43,4 +43,7 @@ public:
protected:
virtual void OnDecomposedText(wxCommandEvent& event);
virtual void OnComposedText(wxCommandEvent& event);
protected:
bool m_progress; ///< A boolean flag to avoid recursive updates of composed and decomposed text controls
};