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

Added more keyboard handling to wxTreeCtrl

Browse Source 
Fixed HitText wrt to items with an image
  changed size calculation in wxStatText


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-19 08:16:45 +00:00
parent 7be1f0d91a
commit a93109d592
6 changed files with 189 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/gtk/stattext.cpp
View File

@@ -35,93 +35,64 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
m_needParent = TRUE;
m_needParent = TRUE;
wxSize newSize = size;
wxSize newSize = size;
PreCreation( parent, id, pos, size, style, name );
PreCreation( parent, id, pos, size, style, name );
wxControl::SetLabel(label);
m_widget = gtk_label_new( m_label );
wxControl::SetLabel(label);
m_widget = gtk_label_new( m_label );
GtkJustification justify;
if ( style & wxALIGN_CENTER )
justify = GTK_JUSTIFY_CENTER;
else if ( style & wxALIGN_RIGHT )
justify = GTK_JUSTIFY_RIGHT;
else // wxALIGN_LEFT is 0
justify = GTK_JUSTIFY_LEFT;
gtk_label_set_justify(GTK_LABEL(m_widget), justify);
int y = 1;
if (newSize.x == -1)
{
char *s = WXSTRINGCAST m_label;
char *nl = strchr(s, '\n');
if (nl)
{
do
{
*nl = 0;
int x = gdk_string_measure( m_widget->style->font, s ) + 4;
if (x > newSize.x) newSize.x = x;
*nl++ = '\n';
++y;
if (! (nl = strchr(s = nl, '\n')))
{
int x = gdk_string_measure( m_widget->style->font, s ) + 4;
if (x > newSize.x) newSize.x = x;
}
} while (nl);
}
else
{
newSize.x = gdk_string_measure( m_widget->style->font, label ) + 4;
}
}
if (newSize.y == -1)
{
if (y == 1)
newSize.y = 26;
else
newSize.y = 4 + y * (m_widget->style->font->ascent + m_widget->style->font->descent + 2);
}
SetSize( newSize.x, newSize.y );
m_parent->AddChild( this );
GtkJustification justify;
if ( style & wxALIGN_CENTER )
justify = GTK_JUSTIFY_CENTER;
else if ( style & wxALIGN_RIGHT )
justify = GTK_JUSTIFY_RIGHT;
else // wxALIGN_LEFT is 0
justify = GTK_JUSTIFY_LEFT;
gtk_label_set_justify(GTK_LABEL(m_widget), justify);
(m_parent->m_insertCallback)( m_parent, this );
PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
GtkRequisition req;
(* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
return TRUE;
if (newSize.x == -1) newSize.x = req.width;
if (newSize.y == -1) newSize.y = req.height;
SetSize( newSize.x, newSize.y );
m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this );
PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
return TRUE;
}
wxString wxStaticText::GetLabel(void) const
{
char *str = (char *) NULL;
gtk_label_get( GTK_LABEL(m_widget), &str );
wxString tmp( str );
return tmp;
char *str = (char *) NULL;
gtk_label_get( GTK_LABEL(m_widget), &str );
wxString tmp( str );
return tmp;
}
void wxStaticText::SetLabel( const wxString &label )
{
wxControl::SetLabel(label);
wxControl::SetLabel(label);
gtk_label_set( GTK_LABEL(m_widget), m_label );
}
gtk_label_set( GTK_LABEL(m_widget), m_label );
}
void wxStaticText::ApplyWidgetStyle()
{
SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle );
SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle );
}