Merge in from trunk r68626 - r68683

[wxWidgets.git] / include / wx / univ / statline.h

diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h
index 3965165d92be4b152d2b6d8388bb659d918164de..85fb86f3a2a80d6b5a7f3b1dfa1dacab7b87f954 100644 (file)
--- a/include/wx/univ/statline.h
+++ b/include/wx/univ/statline.h
@@ -8,14 +8,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstatline.h"
-#endif
-
 #ifndef _WX_UNIV_STATLINE_H_
 #define _WX_UNIV_STATLINE_H_
 
-class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 {
 public:
     // constructors and pseudo-constructors
@@ -26,28 +22,28 @@ public:
                  wxCoord length,
                  long style = wxLI_HORIZONTAL)
     {
-        Create(parent, -1, pos,
-               style & wxLI_VERTICAL ? wxSize(-1, length)
-                                     : wxSize(length, -1),
+        Create(parent, wxID_ANY, pos,
+               style & wxLI_VERTICAL ? wxSize(wxDefaultCoord, length)
+                                     : wxSize(length, wxDefaultCoord),
                style);
     }
 
     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);
     }
 
     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 );
 
 protected:
     virtual void DoDraw(wxControlRenderer *renderer);