wxMSW wxDatePickerCtrl header

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 32c5c4e2942c77b9f2dd9c24c9b6b1d3fa4630f9..88ef181e6b03a201acfedef9c89191bc2f2b37c2 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_SCROLLWIN_H_
@@ -45,7 +45,7 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
 public:
     wxGenericScrolledWindow() : wxScrollHelper(this) { }
     wxGenericScrolledWindow(wxWindow *parent,
-                     wxWindowID winid = -1,
+                     wxWindowID winid = wxID_ANY,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,
@@ -71,6 +71,9 @@ public:
 
     virtual void DoSetVirtualSize(int x, int y);
 
+#ifdef __WXMAC__
+       virtual bool MacClipChildren() const { return true ; }
+#endif
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()