Adapted printing samples makefiles.

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

diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index cebd4a9da85c94f84930ab945ca16d22a91ace7e..612bcb8211fa92108fe557f09301b7ae73d57c49 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -16,12 +16,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "statline.h"
 #endif
 
     #pragma implementation "statline.h"
 #endif
 

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

 #include "wx/wxprec.h"
 #include "wx/wxprec.h"

+#if wxUSE_STATLINE
+// For compilers that support precompilation, includes "wx.h".

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


@@ -47,27 +48,32 @@ 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
 {
     return m_statbox->GetMainWidget();
 }
 
 
 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);
 }
 {
     m_statbox->SetSize(x, y, width, height, sizeFlags);
 }


@@ -76,3 +82,6 @@ void wxStaticLine::DoMoveWindow(int x, int y, int width, int height)
 {
     m_statbox->SetSize(x, y, width, height);
 }
 {
     m_statbox->SetSize(x, y, width, height);
 }

+
+#endif
+  // wxUSE_STATLINE