implement wxChoicebook::SetWindowVariant() by forwarding it to wxChoice (see #10398)

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

diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 32ec10dee64b8d063baf3d1f7e2cadd9dc153b4b..bc1aa294294d2edca2ecc8065938d53b3cb2bb62 100644 (file)
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -11,40 +11,38 @@
 #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__)
-    #pragma interface "statline.h"
-#endif
-

 class wxStaticBox;
 
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 
 class wxStaticBox;
 
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase

 {
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
 
 public:
     // constructors and pseudo-constructors
 {
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
 
 public:
     // constructors and pseudo-constructors

-    wxStaticLine() { }
+    wxStaticLine() { m_statbox = NULL; }

 
     wxStaticLine( wxWindow *parent,
 
     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,

-                  const wxString &name = wxStaticTextNameStr )
+                  const wxString &name = wxStaticLineNameStr )

     {
         Create(parent, id, pos, size, style, name);
     }
 
     {
         Create(parent, id, pos, size, style, name);
     }
 

+    virtual ~wxStaticLine();
+

     bool Create( wxWindow *parent,
     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,

-                 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
 
     // it's necessary to override this wxWindow function because we
     // will want to return the main widget for m_statbox