X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7183e38becd5121af4c96ceabd62fa71746442f5..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/generic/statline.h?ds=sidebyside

diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 5d3dafa675..814156c69b 100644
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/statline.h
+// Name:        wx/generic/statline.h
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
@@ -11,46 +11,48 @@
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 
-#ifdef __GNUG__
-    #pragma interface
-#endif
-
 class wxStaticBox;
 
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
 
 public:
     // constructors and pseudo-constructors
-    wxStaticLine() { }
+    wxStaticLine() { m_statbox = NULL; }
 
     wxStaticLine( wxWindow *parent,
-                  wxWindowID id,
+                  wxWindowID id = wxID_ANY,
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
-                  const wxString &name = wxStaticTextNameStr )
+                  const wxString &name = wxStaticLineNameStr )
     {
         Create(parent, id, pos, size, style, name);
     }
 
+    virtual ~wxStaticLine();
+
     bool Create( wxWindow *parent,
-                 wxWindowID id,
+                 wxWindowID id = wxID_ANY,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxStaticLineNameStr );
 
     // it's necessary to override this wxWindow function because we
     // will want to return the main widget for m_statbox
     //
     WXWidget GetMainWidget() const;
-        
+
+    // override wxWindow methods to make things work
+    virtual void DoSetSize(int x, int y, int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoMoveWindow(int x, int y, int width, int height);
 protected:
     // we implement the static line using a static box
     wxStaticBox *m_statbox;