Added C/wxString array constructors to wxArrayString

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

diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 5e5b13c24f91518388f5dca1ff55a6621ff0992e..a2993d8f84188657a0267ebc7fa30f329c217825 100644 (file)
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -11,7 +11,7 @@
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "statline.h"
 #endif
 
     #pragma interface "statline.h"
 #endif
 


@@ -30,7 +30,7 @@ public:
     wxStaticLine() { m_statbox = NULL; }
 
     wxStaticLine( wxWindow *parent,
     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 wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,


@@ -42,7 +42,7 @@ public:
     virtual ~wxStaticLine();
 
     bool Create( wxWindow *parent,
     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 wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,