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

Replace wxST_MARKUP style with wxControl::SetLabelMarkup().

Browse Source 
This is an incompatible change which removes the wxStaticText-specific
wxST_MARKUP style and adds wxControl::SetLabelMarkup() replacing it.

It doesn't actually change anything yet but it simplifies wxStaticText code a
lot by getting rid of many markup-related functions in it which had to behave
differently depending on whether wxST_MARKUP was used or not and also paves
way for adding markup support for the other controls in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-02-27 12:47:26 +00:00
parent 6ea2bc50c8
commit 3da9cffc79
17 changed files with 290 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/widgets/static.cpp
View File

@@ -216,7 +216,6 @@ void StaticWidgetsPage::CreateContent()
m_chkGeneric = CreateCheckBoxAndAddToSizer(sizerLeft,
"&Generic wxStaticText");
m_chkMarkup = CreateCheckBoxAndAddToSizer(sizerLeft, "Support &markup");
m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, "&Vertical line");
m_chkAutoResize = CreateCheckBoxAndAddToSizer(sizerLeft, "&Fit to text");
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
@@ -341,7 +340,6 @@ void StaticWidgetsPage::Reset()
m_chkVert->SetValue(false);
m_chkAutoResize->SetValue(true);
m_chkEllipsize->SetValue(true);
m_chkMarkup->SetValue(true);
m_radioHAlign->SetSelection(StaticHAlign_Left);
m_radioVAlign->SetSelection(StaticVAlign_Top);
@@ -372,12 +370,6 @@ void StaticWidgetsPage::CreateStatic()
flagsDummyText |= wxST_NO_AUTORESIZE;
}
if ( m_chkMarkup->GetValue() )
{
flagsText |= wxST_MARKUP;
flagsDummyText |= wxST_MARKUP;
}
int align = 0;
switch ( m_radioHAlign->GetSelection() )
{
@@ -457,7 +449,7 @@ void StaticWidgetsPage::CreateStatic()
wxDefaultPosition, wxDefaultSize,
flagsDummyText);
m_statMarkup = new wxGenericStaticText(this, wxID_ANY,
m_textLabelWithMarkup->GetValue(),
wxString(),
wxDefaultPosition, wxDefaultSize,
flagsText);
}
@@ -468,10 +460,13 @@ void StaticWidgetsPage::CreateStatic()
wxDefaultPosition, wxDefaultSize,
flagsDummyText);
m_statMarkup = new wxStaticText(this, wxID_ANY,
m_textLabelWithMarkup->GetValue(),
wxString(),
wxDefaultPosition, wxDefaultSize,
flagsText);
}
m_statMarkup->SetLabelMarkup(m_textLabelWithMarkup->GetValue());
if ( m_chkGreen->GetValue() )
m_statMarkup->SetBackgroundColour(*wxGREEN);
#if wxUSE_STATLINE
@@ -539,7 +534,7 @@ void StaticWidgetsPage::OnButtonLabelText(wxCommandEvent& WXUNUSED(event))
void StaticWidgetsPage::OnButtonLabelWithMarkupText(wxCommandEvent& WXUNUSED(event))
{
m_statMarkup->SetLabel(m_textLabelWithMarkup->GetValue());
m_statMarkup->SetLabelMarkup(m_textLabelWithMarkup->GetValue());
// test GetLabel() and GetLabelText(); the first should return the
// label as it is written in the relative text control; the second should