second merge of the 2.2 branch (RL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -45,28 +45,28 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
|
||||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
|
||||
{
|
||||
wxFAIL_MSG( wxT("wxStaticLine creation failed") );
|
||||
return FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if ( IsVertical() )
|
||||
{
|
||||
m_widget = gtk_vseparator_new();
|
||||
if (size.x == -1)
|
||||
{
|
||||
wxSize new_size( size );
|
||||
new_size.x = 4;
|
||||
SetSize( new_size );
|
||||
}
|
||||
if (size.x == -1)
|
||||
{
|
||||
wxSize new_size( size );
|
||||
new_size.x = 4;
|
||||
SetSize( new_size );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_widget = gtk_hseparator_new();
|
||||
if (size.y == -1)
|
||||
{
|
||||
wxSize new_size( size );
|
||||
new_size.y = 4;
|
||||
SetSize( new_size );
|
||||
}
|
||||
if (size.y == -1)
|
||||
{
|
||||
wxSize new_size( size );
|
||||
new_size.y = 4;
|
||||
SetSize( new_size );
|
||||
}
|
||||
}
|
||||
|
||||
m_parent->DoAddChild( this );
|
||||
|
Reference in New Issue
Block a user