X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50f1fb9226d9260454ccb9c8a67d0be23c2827f..713c7336f2c96b1deddd24ec38b2a094705635b9:/src/gtk/statline.cpp diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp index 98bb5f04b5..9cb487fb6a 100644 --- a/src/gtk/statline.cpp +++ b/src/gtk/statline.cpp @@ -7,9 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statline.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/statline.h" @@ -39,22 +38,47 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - m_needParent = TRUE; - - PreCreation( parent, id, pos, size, style, name ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxStaticLine creation failed") ); + return FALSE; + } if ( IsVertical() ) + { m_widget = gtk_vseparator_new(); + 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 ); + } + } + g_object_ref(m_widget); m_parent->DoAddChild( this ); - PostCreation(); - - Show( TRUE ); + PostCreation(size); return TRUE; } +// static +wxVisualAttributes +wxStaticLine::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_vseparator_new); +} + #endif