applying patch, fixes #10524

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

diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp
index cd67c8a642a6fa0a2452765ff2b2227cdc658b04..9cb487fb6ad4d5a6ae4951cbdd84a38885b8b611 100644 (file)
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -7,9 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 
 #include "wx/statline.h"
 


@@ -39,43 +38,47 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
                            const wxPoint &pos, const wxSize &size,
                            long style, const wxString &name )
 {
                            const wxPoint &pos, const wxSize &size,
                            long style, const wxString &name )
 {

-    m_needParent = TRUE;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {

-        wxFAIL_MSG( _T("wxStaticLine creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxStaticLine creation failed") );
+        return FALSE;

     }
 
     if ( IsVertical() )
     {
         m_widget = gtk_vseparator_new();
     }
 
     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();
     }
     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 );
+        }

     }
     }

+    g_object_ref(m_widget);

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

-    PostCreation();
-
-    Show( TRUE );
+    PostCreation(size);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

+// static
+wxVisualAttributes
+wxStaticLine::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_vseparator_new);
+}
+

 #endif
 #endif