further untangle generic and native GTK implementations of wxScrollHelper: use the standard wxScrollHelperBase/wxScrollHelper naming convention and move the stuff unused by GTK in the generic implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,11 +1,10 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/generic/scrolwin.h
|
||||
// Purpose: wxGenericScrolledWindow class
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// Purpose: generic wxScrollHelper
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2008-12-24 (replacing old file with the same name)
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart
|
||||
// Copyright: (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -13,15 +12,40 @@
|
||||
#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();
|
||||
|
||||
private:
|
||||
virtual void DoScroll(int x, int y);
|
||||
virtual void DoShowScrollbars(wxScrollbarVisibility horz,
|
||||
wxScrollbarVisibility vert);
|
||||
|
||||
// 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,
|
||||
wxScrollbarVisibility visibility);
|
||||
|
||||
|
||||
wxScrollbarVisibility m_xVisibility,
|
||||
m_yVisibility;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxScrollHelper)
|
||||
};
|
||||
|
||||
#endif // _WX_GENERIC_SCROLLWIN_H_
|
||||
|
||||
|
Reference in New Issue
Block a user