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

Corrected spin control, which ignored hand typed text.

Browse Source 
Corrceted GetBestSize() etc of static text (displayed
    in tip dialog and elsewhere).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-03 11:42:49 +00:00
parent 312cd9e93d
commit 33720b2de5
8 changed files with 90 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gtk/stattext.cpp
View File

@@ -62,9 +62,7 @@ bool wxStaticText::Create(wxWindow *parent,
wxControl::SetLabel(label);
m_widget = gtk_label_new( m_label.mbc_str() );
gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
SetFont( parent->GetFont() );
wxControl::SetFont( parent->GetFont() );
GtkJustification justify;
if ( style & wxALIGN_CENTER )
@@ -79,6 +77,9 @@ 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 );
SetSizeOrDefault( size );
m_parent->DoAddChild( this );
@@ -107,10 +108,19 @@ void wxStaticText::SetLabel( const wxString &label )
gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
// adjust the label size to the new label unless disabled
if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
{
if (!HasFlag(wxST_NO_AUTORESIZE))
SetSize( GetBestSize() );
}
}
bool wxStaticText::SetFont( const wxFont &font )
{
bool ret = wxControl::SetFont(font);
// adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE))
SetSize( GetBestSize() );
return ret;
}
void wxStaticText::ApplyWidgetStyle()
@@ -118,3 +128,22 @@ void wxStaticText::ApplyWidgetStyle()
SetWidgetStyle();
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(m_widget)->klass )->size_request )
(m_widget, &req );
return wxSize(req.width, req.height);
}