// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
- #pragma implementation "stattext.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_STATTEXT
#include "wx/stattext.h"
+#include "wx/gtk/private.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
+extern "C"
+void wxgtk_window_size_request_callback(GtkWidget *widget,
+ GtkRequisition *requisition,
+ wxWindow *win);
+
//-----------------------------------------------------------------------------
// wxStaticText
//-----------------------------------------------------------------------------
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;
}
// because the label is not yet created and because SetLabel() has a side
// effect of changing the control size which might not be desirable
wxControl::SetLabel(label);
- m_widget = gtk_label_new( m_label.mbc_str() );
+ m_widget = gtk_label_new( wxGTK_CONV( m_label ) );
GtkJustification justify;
if ( style & wxALIGN_CENTER )
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 );
+ gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
m_parent->DoAddChild( this );
- PostCreation();
-
- ApplyWidgetStyle();
-
- wxControl::SetFont( parent->GetFont() );
+ PostCreation(size);
- wxSize size_best( DoGetBestSize() );
- wxSize new_size( size );
- if (new_size.x == -1)
- new_size.x = size_best.x;
- if (new_size.y == -1)
- new_size.y = size_best.y;
- if ((new_size.x != size.x) || (new_size.y != size.y))
- SetSize( new_size.x, new_size.y );
-
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
- Show( TRUE );
+ // the bug below only happens with GTK 2
+#ifdef __WXGTK20__
+ if ( justify != GTK_JUSTIFY_LEFT )
+ {
+ // if we let GTK call wxgtk_window_size_request_callback the label
+ // always shrinks to its minimal size for some reason and so no
+ // alignment except the default left doesn't work (in fact it does,
+ // but you don't see it)
+ gtk_signal_disconnect_by_func
+ (
+ GTK_OBJECT(m_widget),
+ GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback),
+ (gpointer) this
+ );
+ }
+#endif // __WXGTK20__
return TRUE;
}
wxString wxStaticText::GetLabel() const
{
- char *str = (char *) NULL;
- gtk_label_get( GTK_LABEL(m_widget), &str );
+ GtkLabel *label = GTK_LABEL(m_widget);
+
+#ifdef __WXGTK20__
+ wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+ wxString str = wxString( label->label );
+#endif
return wxString(str);
}
{
wxControl::SetLabel(label);
- gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
+#ifdef __WXGTK20__
+ // 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("<span foreground=\"#%02x%02x%02x\">%s</span>"),
+ 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() );
+ }
}
bool wxStaticText::SetFont( const wxFont &font )
// adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE))
+ {
+ InvalidateBestSize();
SetSize( GetBestSize() );
-
+ }
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
// 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 );
+#ifndef __WXGTK20__
+ // This resets the internal GTK1 size calculation, which
+ // otherwise would be cashed (incorrectly)
+ gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );
+#endif
+ // GetBestSize is supposed to return unwrapped size
+ gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+
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);
+ gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+
+ return wxSize (req.width, req.height);
+}
+
+bool wxStaticText::SetForegroundColour(const wxColour& colour)
+{
+ // First, we call the base class member
+ wxControl::SetForegroundColour(colour);
+ // Then, to force the color change, we set the label with the current label
+ SetLabel(GetLabel());
+ return true;
+}
+
+// static
+wxVisualAttributes
+wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_label_new);
}
#endif // wxUSE_STATTEXT
projects / wxWidgets.git / blobdiff