X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77df51f4fb0822bedc13263af625d50c15ba7abc..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/generic/scrolwin.h?ds=sidebyside diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index 5586fd5a3c..c4f4a0b292 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -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 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,77 +12,41 @@ #define _WX_GENERIC_SCROLLWIN_H_ // ---------------------------------------------------------------------------- -// headers and constants +// generic wxScrollHelper implementation // ---------------------------------------------------------------------------- -#include "wx/window.h" -#include "wx/panel.h" - -extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; - -// default scrolled window style -#ifndef wxScrolledWindowStyle - #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL) -#endif - -// ---------------------------------------------------------------------------- -// wxGenericScrolledWindow -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel, - public wxScrollHelper +class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase { public: - wxGenericScrolledWindow() : wxScrollHelper(this) { } - wxGenericScrolledWindow(wxWindow *parent, - wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr) - : wxScrollHelper(this) - { - Create(parent, winid, pos, size, style, name); - } - - virtual ~wxGenericScrolledWindow(); + wxScrollHelper(wxWindow *winToScroll); - bool Create(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr); - - virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } - - // lay out the window and its children - virtual bool Layout(); - - virtual void DoSetVirtualSize(int x, int y); - - // wxWindow's GetBestVirtualSize returns the actual window size, - // whereas we want to return the virtual size - virtual wxSize GetBestVirtualSize() const; - - // Return the size best suited for the current window - // (this isn't a virtual size, this is a sensible size for the window) - virtual wxSize DoGetBestSize() const; + // implement base class pure virtuals + virtual void AdjustScrollbars(); protected: - // this is needed for wxEVT_PAINT processing hack described in - // wxScrollHelperEvtHandler::ProcessEvent() - void OnPaint(wxPaintEvent& event); - - // we need to return a special WM_GETDLGCODE value to process just the - // arrows but let the other navigation characters through -#ifdef __WXMSW__ - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif // __WXMSW__ + virtual void DoScroll(int x, int y); + virtual void DoShowScrollbars(wxScrollbarVisibility horz, + wxScrollbarVisibility vert); private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericScrolledWindow) - DECLARE_EVENT_TABLE() + // 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_