X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47ca35dd35dede7deac393fb7b8ab892c4efef65..c3732409acc7a1e0b3cdb1f0a5dec7cc49a4b28b:/src/gtk1/stattext.cpp
diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index bfca9d9409..da7039c8ed 100644
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -61,7 +61,7 @@ bool wxStaticText::Create(wxWindow *parent,
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
- wxFAIL_MSG( wxT("wxXX creation failed") );
+ wxFAIL_MSG( wxT("wxStaticText creation failed") );
return FALSE;
}
@@ -85,8 +85,10 @@ bool wxStaticText::Create(wxWindow *parent,
static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
- // do not move this call elsewhere
- gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+ if (size.x == -1)
+ gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+ else
+ gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
m_parent->DoAddChild( this );
@@ -127,37 +129,31 @@ 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
- if (m_foregroundColour.Ok())
- {
- colorlabel.Printf(_T("%s"), m_foregroundColour.Red(),
- m_foregroundColour.Green(), m_foregroundColour.Blue(), label.c_str());
- }
-
wxControl::SetLabel(label);
- // markup only allowed under GTK2
#ifdef __WXGTK20__
- gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
-#else
- 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 ) );
+ // Build the colorized version of the label (markup only allowed
+ // under GTK2):
+ if (m_foregroundColour.Ok())
+ {
+ // If the color has been set, create a markup string to pass to
+ // the label setter
+ wxString colorlabel;
+ colorlabel.Printf(_T("%s"),
+ m_foregroundColour.Red(), m_foregroundColour.Green(),
+ m_foregroundColour.Blue(),
+ wxEscapeStringForPangoMarkup(label).c_str());
+ gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
+ }
+ else
#endif
-
+ gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
// adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE))
{
+ InvalidateBestSize();
SetSize( GetBestSize() );
- SetSizeHints(GetSize());
}
}
@@ -168,16 +164,17 @@ bool wxStaticText::SetFont( const wxFont &font )
// adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE))
{
+ InvalidateBestSize();
SetSize( GetBestSize() );
- SetSizeHints(GetSize());
}
return ret;
}
-void wxStaticText::ApplyWidgetStyle()
+void wxStaticText::DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags )
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ wxControl::DoSetSize( x, y, width, height, sizeFlags );
}
wxSize wxStaticText::DoGetBestSize() const
@@ -185,17 +182,20 @@ wxSize wxStaticText::DoGetBestSize() const
// Do not return any arbitrary default value...
wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
- // this invalidates the size request
- gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
- gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
-
+ int width = m_width;
+#ifndef __WXGTK20__
+ gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );
+ if (width < 3) width = -1;
+#endif
+ gtk_widget_set_usize( m_widget, width, -1 );
+
GtkRequisition req;
- req.width = 2;
- req.height = 2;
+ req.width = -1;
+ req.height = -1;
(* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
(m_widget, &req );
- return wxSize(req.width, req.height);
+ return wxSize (req.width, req.height);
}
bool wxStaticText::SetForegroundColour(const wxColour& colour)