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 0e05c9e758d6b988a9c4d0f03d2f845fc798983f..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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -21,8 +21,6 @@
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
 // wxStaticLine
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-

 wxStaticLine::wxStaticLine()
 {
 }
 wxStaticLine::wxStaticLine()
 {
 }


@@ -38,8 +36,6 @@ 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 ))
     {


@@ -67,6 +63,7 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
             SetSize( new_size );
         }
     }
             SetSize( new_size );
         }
     }

+    g_object_ref(m_widget);

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