The markup code for wxStaticText doesn't work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
54d73f3d78
commit
47ca35dd35
@ -127,6 +127,7 @@ wxString wxStaticText::GetLabel() const
|
||||
|
||||
void wxStaticText::SetLabel( const wxString &label )
|
||||
{
|
||||
#if 0
|
||||
// Build the colorized version of the label
|
||||
wxString colorlabel = label;
|
||||
// If the color has been set, create a markup string to pass to the label setter
|
||||
@ -145,6 +146,13 @@ void wxStaticText::SetLabel( const wxString &label )
|
||||
gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
wxControl::SetLabel(label);
|
||||
gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
|
||||
#endif
|
||||
|
||||
|
||||
// adjust the label size to the new label unless disabled
|
||||
if (!HasFlag(wxST_NO_AUTORESIZE))
|
||||
{
|
||||
|
@ -127,6 +127,7 @@ wxString wxStaticText::GetLabel() const
|
||||
|
||||
void wxStaticText::SetLabel( const wxString &label )
|
||||
{
|
||||
#if 0
|
||||
// Build the colorized version of the label
|
||||
wxString colorlabel = label;
|
||||
// If the color has been set, create a markup string to pass to the label setter
|
||||
@ -145,6 +146,13 @@ void wxStaticText::SetLabel( const wxString &label )
|
||||
gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
wxControl::SetLabel(label);
|
||||
gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
|
||||
#endif
|
||||
|
||||
|
||||
// adjust the label size to the new label unless disabled
|
||||
if (!HasFlag(wxST_NO_AUTORESIZE))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user