Apply parts of patch #1719888 to fix compilation on Mac and with

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

diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 092cdde6a6ad68411fb078112df86956a0f0538b..ae1ce7aa0083fbdfc1c2ec8f96ed83e43b08ca16 100644 (file)
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -5,16 +5,12 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statline.h"
-#endif
-
 class wxStaticBox;
 
 // ----------------------------------------------------------------------------
@@ -30,11 +26,11 @@ public:
     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);
     }
@@ -42,11 +38,11 @@ public:
     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