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

restored colour labels until we have more information, it seems to work with all GTK2 versions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-06 14:49:21 +00:00
parent af318c88de
commit 8ccac79865
2 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gtk/stattext.cpp
View File

@@ -61,7 +61,7 @@ bool wxStaticText::Create(wxWindow *parent,
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{ {
wxFAIL_MSG( wxT("wxXX creation failed") ); wxFAIL_MSG( wxT("wxStaticText creation failed") );
return FALSE; return FALSE;
} }
@@ -127,32 +127,26 @@ 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
wxString colorlabel = label;
// If the color has been set, create a markup string to pass to the label setter
if (m_foregroundColour.Ok())
{
colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"), m_foregroundColour.Red(),
m_foregroundColour.Green(), m_foregroundColour.Blue(), label.c_str());
}
wxControl::SetLabel(label); wxControl::SetLabel(label);
// markup only allowed under GTK2
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Build the colorized version of the label (markup only allowed
// under GTK2):
wxString colorlabel = label;
// If the color has been set, create a markup string to pass to
// the label setter
if (m_foregroundColour.Ok())
{
colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
m_foregroundColour.Red(), m_foregroundColour.Green(),
m_foregroundColour.Blue(), label.c_str());
}
gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) ); gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
#else #else
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))
{ {

32
src/gtk1/stattext.cpp
View File

@@ -61,7 +61,7 @@ bool wxStaticText::Create(wxWindow *parent,
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{ {
wxFAIL_MSG( wxT("wxXX creation failed") ); wxFAIL_MSG( wxT("wxStaticText creation failed") );
return FALSE; return FALSE;
} }
@@ -127,32 +127,26 @@ 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
wxString colorlabel = label;
// If the color has been set, create a markup string to pass to the label setter
if (m_foregroundColour.Ok())
{
colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"), m_foregroundColour.Red(),
m_foregroundColour.Green(), m_foregroundColour.Blue(), label.c_str());
}
wxControl::SetLabel(label); wxControl::SetLabel(label);
// markup only allowed under GTK2
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Build the colorized version of the label (markup only allowed
// under GTK2):
wxString colorlabel = label;
// If the color has been set, create a markup string to pass to
// the label setter
if (m_foregroundColour.Ok())
{
colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
m_foregroundColour.Red(), m_foregroundColour.Green(),
m_foregroundColour.Blue(), label.c_str());
}
gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) ); gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
#else #else
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))
{ {