take const address objects in wxSocketClient::Connect() and wxSocketBase::SetLocal()

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

diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h
index c6419bb5135ca25cf371c52572813cb79872ebac..85fb86f3a2a80d6b5a7f3b1dfa1dacab7b87f954 100644 (file)
--- a/include/wx/univ/statline.h
+++ b/include/wx/univ/statline.h
@@ -8,14 +8,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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_
 
 #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
 {
 public:
     // constructors and pseudo-constructors


@@ -33,21 +29,21 @@ public:
     }
 
     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);
     }
 
     bool Create(wxWindow *parent,
     {
         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 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);
 
 protected:
     virtual void DoDraw(wxControlRenderer *renderer);