Always link with expat in monolithic build.

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

diff --git a/src/univ/statline.cpp b/src/univ/statline.cpp
index 4f6e832458bbb122bb1d373336fa4d63b1dbb716..b353bf7474e98bb08d9ad4ff5238c819ca45996e 100644 (file)
--- a/src/univ/statline.cpp
+++ b/src/univ/statline.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxStaticLine implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Purpose:     wxStaticLine implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univstatline.h"
-#endif
-

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


@@ -42,8 +38,6 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-

 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------


@@ -56,13 +50,13 @@ bool wxStaticLine::Create(wxWindow *parent,
                           const wxString &name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
                           const wxString &name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     wxSize sizeReal = AdjustSize(size);
     if ( sizeReal != size )
         SetSize(sizeReal);
 
 
     wxSize sizeReal = AdjustSize(size);
     if ( sizeReal != size )
         SetSize(sizeReal);
 

-    return TRUE;
+    return true;

 }
 
 void wxStaticLine::DoDraw(wxControlRenderer *renderer)
 }
 
 void wxStaticLine::DoDraw(wxControlRenderer *renderer)