don't use deprecated toolbar API

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

diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index 122af4679991e6941c9b1a71a58af31dcbf771c3..023745015db8b4044064c3c0bd3245f07105d987 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/statline.cpp
+// Name:        src/generic/statline.cpp

 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99


@@ -16,20 +16,21 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "statline.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#if wxUSE_STATLINE

 // For compilers that support precompilation, includes "wx.h".
 // For compilers that support precompilation, includes "wx.h".

-#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATLINE
+

 #include "wx/statline.h"
 #include "wx/statline.h"

-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -48,19 +49,25 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
                            long style,
                            const wxString &name)
 {

+    m_statbox = NULL;
+

     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
     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);
 
 
     // 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
 {
 
 WXWidget wxStaticLine::GetMainWidget() const
 {