// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "stattext.h"
#endif
+// 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
//-----------------------------------------------------------------------------
{
m_needParent = TRUE;
- wxSize newSize = size;
-
- PreCreation( parent, id, pos, size, style, name );
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( wxT("wxXX creation failed") );
+ return FALSE;
+ }
// notice that we call the base class version which will just remove the
// '&' characters from the string, but not set the label's text to it
// 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 )
justify = GTK_JUSTIFY_CENTER;
justify = GTK_JUSTIFY_LEFT;
gtk_label_set_justify(GTK_LABEL(m_widget), justify);
- GtkRequisition req;
- (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-
- if (newSize.x == -1) newSize.x = req.width;
- if (newSize.y == -1) newSize.y = req.height;
-
- SetSize( newSize.x, newSize.y );
+ // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
+ static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
+ gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
- m_parent->AddChild( this );
+ // do not move this call elsewhere
+ gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
- (m_parent->m_insertCallback)( m_parent, this );
+ m_parent->DoAddChild( this );
PostCreation();
-
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
-
+
+ // 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__
+
+ ApplyWidgetStyle();
+
+ InheritAttributes();
+// wxControl::SetFont( parent->GetFont() );
+
+ 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 );
+
+// if (ShouldInheritColours())
+// {
+// SetBackgroundColour( parent->GetBackgroundColour() );
+// SetForegroundColour( parent->GetForegroundColour() );
+// }
Show( TRUE );
return TRUE;
}
-wxString wxStaticText::GetLabel(void) const
+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() );
+ gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
- // adjust the label size to the new label
+ // adjust the label size to the new label unless disabled
+ if (!HasFlag(wxST_NO_AUTORESIZE))
+ SetSize( GetBestSize() );
+}
- // TODO there should be a way to prevent SetLabel() from doing it (an
- // additional parameter?)
- GtkRequisition req;
- (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+bool wxStaticText::SetFont( const wxFont &font )
+{
+ bool ret = wxControl::SetFont(font);
- SetSize( req.width, req.height );
+ // adjust the label size to the new label unless disabled
+ if (!HasFlag(wxST_NO_AUTORESIZE))
+ SetSize( GetBestSize() );
+
+ return ret;
}
void wxStaticText::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle );
}
+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 );
+
+ GtkRequisition req;
+ req.width = 2;
+ req.height = 2;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+ (m_widget, &req );
+
+ return wxSize(req.width, req.height);
+}
+
+#endif // wxUSE_STATTEXT
projects / wxWidgets.git / blobdiff