added wx/font.h include to fix PCH-less build

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

diff --git a/include/wx/cocoa/statline.h b/include/wx/cocoa/statline.h
index 74469940c3a84ef8d3186530c4ffe6f0b1a8fe3e..9c69a65ea8a6ed1e113a5f0a63fb826c91c693f5 100644 (file)
--- a/include/wx/cocoa/statline.h
+++ b/include/wx/cocoa/statline.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/18
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATLINE_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATLINE_H__


@@ -27,7 +27,7 @@ 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,
             long style = 0, const wxString& name = wxStaticTextNameStr)
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = 0, const wxString& name = wxStaticTextNameStr)


@@ -35,7 +35,7 @@ public:
         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,
             long style = 0, const wxString& name = wxStaticTextNameStr);
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = 0, const wxString& name = wxStaticTextNameStr);


@@ -45,6 +45,8 @@ public:
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:

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

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