Merge in from trunk r64802 - r68625

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

diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp
index 3f95edd803b53931fa465226d912df09c52624fa..c199ece70eba908e64b4103d7bbe95466f053c41 100644 (file)
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statline.cpp
+// Name:        src/gtk/statline.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statline.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -25,8 +21,6 @@
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 wxStaticLine::wxStaticLine()
 {
 }
@@ -42,8 +36,6 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
                            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 ))
     {
@@ -71,6 +63,7 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
             SetSize( new_size );
         }
     }
+    g_object_ref(m_widget);
 
     m_parent->DoAddChild( this );