Use wxGetTranslation() instead of _() in the public headers.

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

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index de52bde70ea3e310698e81e20a8fffaf3ac0432b..863cdf923e9f8673a9d13930ff34acde914c8b7b 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -1,11 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/generic/scrolwin.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/generic/scrolwin.h

-// Purpose:     wxGenericScrolledWindow class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
+// Purpose:     generic wxScrollHelper
+// Author:      Vadim Zeitlin
+// Created:     2008-12-24 (replacing old file with the same name)
+// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -13,15 +11,43 @@
 #define _WX_GENERIC_SCROLLWIN_H_
 
 // ----------------------------------------------------------------------------
 #define _WX_GENERIC_SCROLLWIN_H_
 
 // ----------------------------------------------------------------------------

-// headers and constants
+// generic wxScrollHelper implementation

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-#include "wx/window.h"
-#include "wx/panel.h"
+class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase
+{
+public:
+    wxScrollHelper(wxWindow *winToScroll);

 
 

-// ----------------------------------------------------------------------------
-// wxGenericScrolledWindow
-// ----------------------------------------------------------------------------
+    // implement base class pure virtuals
+    virtual void AdjustScrollbars();
+    virtual bool IsScrollbarShown(int orient) const;
+
+protected:
+    virtual void DoScroll(int x, int y);
+    virtual void DoShowScrollbars(wxScrollbarVisibility horz,
+                                  wxScrollbarVisibility vert);
+
+private:
+    // helper of AdjustScrollbars(): does the work for the single scrollbar
+    //
+    // notice that the parameters passed by non-const references are modified
+    // by this function
+    void DoAdjustScrollbar(int orient,
+                           int clientSize,
+                           int virtSize,
+                           int pixelsPerUnit,
+                           int& scrollUnits,
+                           int& scrollPosition,
+                           int& scrollLinesPerPage,
+                           wxScrollbarVisibility visibility);
+
+
+    wxScrollbarVisibility m_xVisibility,
+                          m_yVisibility;
+
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);
+};

 
 #endif // _WX_GENERIC_SCROLLWIN_H_
 
 
 #endif // _WX_GENERIC_SCROLLWIN_H_