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

Allow updating wxBusyInfo text while it's shown

Browse Source 
Add UpdateText() and UpdateLabel() updating the text (i.e. possibly
containing markup) or the label (just plain text) shown in the window.

Closes #14743.

Closes https://github.com/Kvaz1r/wxWidgets.git BusyInfoUpdateText14743
This commit is contained in:
Kvaz1r
2019-09-07 16:31:28 +03:00
committed by Vadim Zeitlin
parent 32eb6f1a2c
commit 16b08c6ef9
3 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/generic/busyinfo.cpp
View File

@@ -79,24 +79,21 @@ void wxBusyInfo::Init(const wxBusyInfoFlags& flags)
// Vertically center the text in the window.
sizer->AddStretchSpacer();
wxControl* text;
#if wxUSE_MARKUP
m_text = new wxStaticTextWithMarkupSupport(panel, wxID_ANY, wxString(),
wxDefaultPosition,
wxDefaultSize,
wxALIGN_CENTRE);
if ( !flags.m_text.empty() )
{
text = new wxStaticTextWithMarkupSupport(panel, wxID_ANY, wxString(),
wxDefaultPosition,
wxDefaultSize,
wxALIGN_CENTRE);
text->SetLabelMarkup(flags.m_text);
}
m_text->SetLabelMarkup(flags.m_text);
else
m_text->SetLabelText(flags.m_label);
#else
m_text = new wxStaticText(panel, wxID_ANY, wxString());
m_text->SetLabelText(flags.m_label);
#endif // wxUSE_MARKUP
{
text = new wxStaticText(panel, wxID_ANY, wxString());
text->SetLabelText(flags.m_label);
}
sizer->Add(text, wxSizerFlags().DoubleBorder().Centre());
sizer->Add(m_text, wxSizerFlags().DoubleBorder().Centre());
sizer->AddStretchSpacer();
@@ -106,7 +103,7 @@ void wxBusyInfo::Init(const wxBusyInfoFlags& flags)
{
if ( title )
title->SetForegroundColour(flags.m_foreground);
text->SetForegroundColour(flags.m_foreground);
m_text->SetForegroundColour(flags.m_foreground);
}
if ( flags.m_background.IsOk() )
@@ -131,6 +128,16 @@ void wxBusyInfo::Init(const wxBusyInfoFlags& flags)
m_InfoFrame->Update();
}
void wxBusyInfo::UpdateText(const wxString& str)
{
m_text->SetLabelMarkup(str);
}
void wxBusyInfo::UpdateLabel(const wxString& str)
{
m_text->SetLabelText(str);
}
wxBusyInfo::~wxBusyInfo()
{
m_InfoFrame->Show(false);