added template wxScopedArray<> too

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

diff --git a/include/wx/cocoa/statline.h b/include/wx/cocoa/statline.h
index c470309216c6a870ee44fdbe4c4971372f423f17..990e5e80bfed26d114f43dedd545bfac98349e6f 100644 (file)
--- a/include/wx/cocoa/statline.h
+++ b/include/wx/cocoa/statline.h
@@ -17,7 +17,7 @@
 // ========================================================================
 // wxStaticLine
 // ========================================================================
 // ========================================================================
 // wxStaticLine
 // ========================================================================

-class WXDLLEXPORT wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSButton
+class WXDLLIMPEXP_CORE wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSButton

 {
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
     DECLARE_EVENT_TABLE()


@@ -30,7 +30,7 @@ public:
     wxStaticLine(wxWindow *parent, wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
     wxStaticLine(wxWindow *parent, wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = 0, const wxString& name = wxStaticTextNameStr)
+            long style = 0, const wxString& name = wxStaticLineNameStr)

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


@@ -38,7 +38,7 @@ public:
     bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
     bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = 0, const wxString& name = wxStaticTextNameStr);
+            long style = 0, const wxString& name = wxStaticLineNameStr);

     virtual ~wxStaticLine();
 
 // ------------------------------------------------------------------------
     virtual ~wxStaticLine();
 
 // ------------------------------------------------------------------------


@@ -46,7 +46,7 @@ public:
 // ------------------------------------------------------------------------
 protected:
     // Static lines cannot be enabled/disabled
 // ------------------------------------------------------------------------
 protected:
     // Static lines cannot be enabled/disabled

-    virtual void CocoaSetEnabled(bool enable) { }
+    virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { }

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------