SetMenuBar potential memory leak fixed; added wxTAB_TRAVERSAL as dummy (0) style

[wxWidgets.git] / src / gtk1 / statline.cpp

diff --git a/src/gtk1/statline.cpp b/src/gtk1/statline.cpp
index 98bb5f04b5c3225cea85e54f7e69f5273ddc5a4a..cd67c8a642a6fa0a2452765ff2b2227cdc658b04 100644 (file)
--- a/src/gtk1/statline.cpp
+++ b/src/gtk1/statline.cpp
@@ -41,12 +41,33 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
 {
     m_needParent = TRUE;
 
 {
     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( _T("wxStaticLine creation failed") );
+       return FALSE;
+    }

 
     if ( IsVertical() )
 
     if ( IsVertical() )

+    {

         m_widget = gtk_vseparator_new();
         m_widget = gtk_vseparator_new();

+       if (size.x == -1)
+       {
+           wxSize new_size( size );
+           new_size.x = 4;
+           SetSize( new_size );
+       }
+    }

     else
     else

+    {

         m_widget = gtk_hseparator_new();
         m_widget = gtk_hseparator_new();

+       if (size.y == -1)
+       {
+           wxSize new_size( size );
+           new_size.y = 4;
+           SetSize( new_size );
+       }
+    }

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );