Don't crash in wxGridCellAutoWrapStringRenderer when the column is hidden.

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

diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index cebd4a9da85c94f84930ab945ca16d22a91ace7e..a36445889bb06c288c938d75dcbf054f2c241c01 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/statline.cpp
+// Name:        src/generic/statline.cpp
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,26 +15,26 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "statline.h"
-#endif
+#include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#if wxUSE_STATLINE
+
 #include "wx/statline.h"
-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
@@ -47,27 +46,32 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
+    m_statbox = NULL;
+
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return FALSE;
+        return false;
 
     // ok, this is ugly but it's better than nothing: use a thin static box to
     // emulate static line
 
     wxSize sizeReal = AdjustSize(size);
 
-    m_statbox = new wxStaticBox(parent, id, wxT(""), pos, sizeReal, style, name);
+    m_statbox = new wxStaticBox(parent, id, wxEmptyString, pos, sizeReal, style, name);
 
-    return TRUE;
+    return true;
 }
 
+wxStaticLine::~wxStaticLine()
+{
+    delete m_statbox;
+}
 
 WXWidget wxStaticLine::GetMainWidget() const
 {
     return m_statbox->GetMainWidget();
 }
 
-void wxStaticLine::DoSetSize(int x, int y, int width, int height,
-                             int sizeFlags = wxSIZE_AUTO)
+void wxStaticLine::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     m_statbox->SetSize(x, y, width, height, sizeFlags);
 }
@@ -76,3 +80,6 @@ void wxStaticLine::DoMoveWindow(int x, int y, int width, int height)
 {
     m_statbox->SetSize(x, y, width, height);
 }
+
+#endif
+  // wxUSE_STATLINE