Merge in from trunk r67662 to r64801

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

diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h
index 4a98f8a1d578703787db340ab7542e259be29097..5cddf0fc596c9e9a94a665eb5ea1e393547ab9be 100644 (file)
--- a/include/wx/os2/statline.h
+++ b/include/wx/os2/statline.h
@@ -1,54 +1,50 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/statline.h
+// Name:        wx/os2/statline.h
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OS2_STATLINE_H_
 #define _WX_OS2_STATLINE_H_
 
-#ifdef __GNUG__
-    #pragma interface
-#endif
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 {
 
 public:
     // constructors and pseudo-constructors
     wxStaticLine() { }
     wxStaticLine( wxWindow*       pParent
-                 ,wxWindowID      vId
+                 ,wxWindowID      vId = wxID_ANY
                  ,const wxPoint&  rPos = wxDefaultPosition
                  ,const wxSize&   rSize = wxDefaultSize
                  ,long            lStyle = wxLI_HORIZONTAL
-                 ,const wxString& rsName = wxStaticTextNameStr
+                 ,const wxString& rsName = wxStaticLineNameStr
                 )
     {
         Create(pParent, vId, rPos, rSize, lStyle, rsName);
     }
 
     bool Create(  wxWindow*       pParent
-                 ,wxWindowID      vId
+                 ,wxWindowID      vId = wxID_ANY
                  ,const wxPoint&  rPos = wxDefaultPosition
                  ,const wxSize&   rSize = wxDefaultSize
                  ,long            lStyle = wxLI_HORIZONTAL
-                 ,const wxString& rsName = wxStaticTextNameStr
+                 ,const wxString& rsName = wxStaticLineNameStr
                 );
 
     inline bool          IsVertical(void) const { return((GetWindowStyleFlag() & wxLI_VERTICAL) != 0); }
     inline static int    GetDefaultSize(void) { return 2; }
 
     //
-    // Overriden base class virtuals
+    // Overridden base class virtuals
     //
     inline virtual bool AcceptsFocus(void) const {return FALSE;}