reverted last commit, still broken for VC6

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

diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index 964385982f45ed34a142b25c3e45820f73fedd39..612bcb8211fa92108fe557f09301b7ae73d57c49 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -16,12 +16,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "statline.h"
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+#if wxUSE_STATLINE
+// For compilers that support precompilation, includes "wx.h".
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -47,21 +48,40 @@ 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)
+{
+    m_statbox->SetSize(x, y, width, height, sizeFlags);
+}
+
+void wxStaticLine::DoMoveWindow(int x, int y, int width, int height)
+{
+    m_statbox->SetSize(x, y, width, height);
+}
+
+#endif
+  // wxUSE_STATLINE