implemented wxStackWalker for Unix (using glibc-specific methods); moved wxUSE_STACKW...

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 9ff4daa8288011c174725846dc64f23d383249ba..88ef181e6b03a201acfedef9c89191bc2f2b37c2 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -43,13 +43,17 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
                                             public wxScrollHelper
 {
 public:
                                             public wxScrollHelper
 {
 public:

-    wxGenericScrolledWindow();
+    wxGenericScrolledWindow() : wxScrollHelper(this) { }

     wxGenericScrolledWindow(wxWindow *parent,
     wxGenericScrolledWindow(wxWindow *parent,

-                     wxWindowID winid = -1,
+                     wxWindowID winid = wxID_ANY,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,

-                     const wxString& name = wxPanelNameStr);
+                     const wxString& name = wxPanelNameStr)
+        : wxScrollHelper(this)
+    {
+        Create(parent, winid, pos, size, style, name);
+    }

 
     virtual ~wxGenericScrolledWindow();
 
 
     virtual ~wxGenericScrolledWindow();
 


@@ -67,6 +71,9 @@ public:
 
     virtual void DoSetVirtualSize(int x, int y);
 
 
     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()
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()


@@ -75,7 +82,7 @@ protected:
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 #ifdef __WXMSW__
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 #ifdef __WXMSW__

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 #endif // __WXMSW__
 
 private:
 #endif // __WXMSW__
 
 private: