Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/cocoa/statline.h b/include/wx/cocoa/statline.h
index 74469940c3a84ef8d3186530c4ffe6f0b1a8fe3e..990e5e80bfed26d114f43dedd545bfac98349e6f 100644 (file)
--- a/include/wx/cocoa/statline.h
+++ b/include/wx/cocoa/statline.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATLINE_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __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()


@@ -27,24 +27,26 @@ class WXDLLEXPORT wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSB
 // ------------------------------------------------------------------------
 public:
     wxStaticLine() { }
 // ------------------------------------------------------------------------
 public:
     wxStaticLine() { }

-    wxStaticLine(wxWindow *parent, wxWindowID winid,
+    wxStaticLine(wxWindow *parent, wxWindowID winid = wxID_ANY,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             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);
     }
 

-    bool Create(wxWindow *parent, wxWindowID winid,
+    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

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

     virtual ~wxStaticLine();
 
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:
     virtual ~wxStaticLine();
 
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:

+    // Static lines cannot be enabled/disabled
+    virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { }

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