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

The markup code for wxStaticText doesn't work.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-05-15 17:33:46 +00:00
parent 54d73f3d78
commit 47ca35dd35
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/stattext.cpp
View File

@@ -127,6 +127,7 @@ wxString wxStaticText::GetLabel() const
void wxStaticText::SetLabel( const wxString &label ) void wxStaticText::SetLabel( const wxString &label )
{ {
#if 0
// Build the colorized version of the label // Build the colorized version of the label
wxString colorlabel = label; wxString colorlabel = label;
// If the color has been set, create a markup string to pass to the label setter // 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 ) ); gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
#endif #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 // adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE)) if (!HasFlag(wxST_NO_AUTORESIZE))
{ {

8
src/gtk1/stattext.cpp
View File

@@ -127,6 +127,7 @@ wxString wxStaticText::GetLabel() const
void wxStaticText::SetLabel( const wxString &label ) void wxStaticText::SetLabel( const wxString &label )
{ {
#if 0
// Build the colorized version of the label // Build the colorized version of the label
wxString colorlabel = label; wxString colorlabel = label;
// If the color has been set, create a markup string to pass to the label setter // 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 ) ); gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
#endif #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 // adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE)) if (!HasFlag(wxST_NO_AUTORESIZE))
{ {