cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-12-24 16:43:30 +00:00
parent 69e9752529
commit 29e1398fa0
7 changed files with 738 additions and 703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/wx/generic/scrolwin.h
View File

@ -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_

6
include/wx/gtk/scrolwin.h
View File

@ -16,11 +16,11 @@
// wxScrolledWindow
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxScrollHelperNative : public wxScrollHelper
class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase
{
public:
// default ctor doesn't do anything
wxScrollHelperNative(wxWindow *win) : wxScrollHelper(win) { }
wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { }
virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY,
@ -70,7 +70,7 @@ protected:
wxScrollbarVisibility vert);
private:
DECLARE_NO_COPY_CLASS(wxScrollHelperNative)
DECLARE_NO_COPY_CLASS(wxScrollHelper)
};
#endif // _WX_GTK_SCROLLWIN_H_

23
include/wx/gtk1/scrolwin.h
View File

@ -16,20 +16,23 @@
// wxScrolledWindow
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxScrollHelperNative : public wxScrollHelper
class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase
{
public:
// default ctor doesn't do anything
wxScrollHelperNative(wxWindow *win) : wxScrollHelper(win) { }
wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { }
// implement base class pure virtuals
virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY,
int xPos = 0, int yPos = 0,
bool noRefresh = false);
virtual void AdjustScrollbars();
virtual void Scroll(int x, int y);
protected:
virtual void DoScroll(int x, int y);
virtual void DoShowScrollbars(wxScrollbarVisibility horz,
wxScrollbarVisibility vert);
// this does (each) half of AdjustScrollbars() work
void DoAdjustScrollbar(GtkAdjustment *adj,
int pixelsPerLine,
@ -40,14 +43,14 @@ protected:
int *linesPerPage);
// and this does the same for Scroll()
void DoScroll(int orient,
GtkAdjustment *adj,
int pos,
int pixelsPerLine,
int *posOld);
void DoScrollOneDir(int orient,
GtkAdjustment *adj,
int pos,
int pixelsPerLine,
int *posOld);
private:
DECLARE_NO_COPY_CLASS(wxScrollHelperNative)
DECLARE_NO_COPY_CLASS(wxScrollHelper)
};
#endif // _WX_GTK_SCROLLWIN_H_

59
include/wx/scrolwin.h
View File

@ -37,11 +37,11 @@ enum wxScrollbarVisibility
//
// So we have
//
// wxScrollHelper
// wxScrollHelperBase
// |
// |
// \|/
// wxWindow wxScrollHelperNative
// wxWindow wxScrollHelper
// | \ / /
// | \ / /
// | _| |_ /
@ -56,12 +56,12 @@ enum wxScrollbarVisibility
//
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxScrollHelper
class WXDLLIMPEXP_CORE wxScrollHelperBase
{
public:
// ctor must be given the associated window
wxScrollHelper(wxWindow *winToScroll);
virtual ~wxScrollHelper();
wxScrollHelperBase(wxWindow *winToScroll);
virtual ~wxScrollHelperBase();
// configure the scrolling
virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
@ -85,8 +85,7 @@ public:
void SetScrollRate( int xstep, int ystep );
// get the size of one logical unit in physical ones
virtual void GetScrollPixelsPerUnit(int *pixelsPerUnitX,
int *pixelsPerUnitY) const;
void GetScrollPixelsPerUnit(int *pixelsPerUnitX, int *pixelsPerUnitY) const;
// Set scrollbar visibility: it is possible to show scrollbar only if it is
// needed (i.e. if our virtual size is greater than the current size of the
@ -139,21 +138,21 @@ public:
return p2;
}
virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
// Adjust the scrollbars
virtual void AdjustScrollbars(void);
virtual void AdjustScrollbars() = 0;
// Calculate scroll increment
virtual int CalcScrollInc(wxScrollWinEvent& event);
int CalcScrollInc(wxScrollWinEvent& event);
// Normally the wxScrolledWindow will scroll itself, but in some rare
// occasions you might want it to scroll [part of] another window (e.g. a
// child of it in order to scroll only a portion the area between the
// scrollbars (spreadsheet: only cell area will move).
virtual void SetTargetWindow(wxWindow *target);
virtual wxWindow *GetTargetWindow() const;
void SetTargetWindow(wxWindow *target);
wxWindow *GetTargetWindow() const;
void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; }
wxRect GetTargetRect() const { return m_rectToScroll; }
@ -219,9 +218,9 @@ protected:
// implementation of public methods with the same name
virtual void DoGetViewStart(int *x, int *y) const;
virtual void DoScroll(int x, int y);
virtual void DoScroll(int x, int y) = 0;
virtual void DoShowScrollbars(wxScrollbarVisibility horz,
wxScrollbarVisibility vert);
wxScrollbarVisibility vert) = 0;
// implementations of various wxWindow virtual methods which should be
// forwarded to us (this can be done by WX_FORWARD_TO_SCROLL_HELPER())
@ -240,18 +239,6 @@ protected:
// in wxScrollHelperEvtHandler::ProcessEvent()
void ResetDrawnFlag();
// 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 AdjustScrollbar(int orient,
int clientSize,
int virtSize,
int& pixelsPerUnit,
int& scrollUnits,
int& scrollPosition,
wxScrollbarVisibility visibility);
// this function should be overridden to return the size available for
// m_targetWindow inside m_win of the given size
//
@ -297,10 +284,7 @@ protected:
wxScrollHelperEvtHandler *m_handler;
wxScrollbarVisibility m_xVisibility,
m_yVisibility;
DECLARE_NO_COPY_CLASS(wxScrollHelper)
DECLARE_NO_COPY_CLASS(wxScrollHelperBase)
};
// this macro can be used in a wxScrollHelper-derived class to forward wxWindow
@ -314,13 +298,14 @@ public: \
virtual wxSize GetBestVirtualSize() const \
{ return ScrollGetBestVirtualSize(); }
// include the declaration of wxScrollHelperNative if needed
// include the declaration of the real wxScrollHelper
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include "wx/gtk/scrolwin.h"
#elif defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
#include "wx/gtk1/scrolwin.h"
#else
typedef wxScrollHelper wxScrollHelperNative;
#define wxHAS_GENERIC_SCROLLWIN
#include "wx/generic/scrolwin.h"
#endif
// ----------------------------------------------------------------------------
@ -331,7 +316,7 @@ public: \
struct WXDLLIMPEXP_CORE wxScrolledT_Helper
{
static wxSize FilterBestSize(const wxWindow *win,
const wxScrollHelperNative *helper,
const wxScrollHelper *helper,
const wxSize& origBest);
#ifdef __WXMSW__
static WXLRESULT FilterMSWWindowProc(WXUINT nMsg, WXLRESULT origResult);
@ -343,18 +328,18 @@ struct WXDLLIMPEXP_CORE wxScrolledT_Helper
// not always desirable.
template<class T>
class WXDLLIMPEXP_CORE wxScrolled : public T,
public wxScrollHelperNative,
public wxScrollHelper,
private wxScrolledT_Helper
{
public:
wxScrolled() : wxScrollHelperNative(this) { }
wxScrolled() : wxScrollHelper(this) { }
wxScrolled(wxWindow *parent,
wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxScrolledWindowStyle,
const wxString& name = wxPanelNameStr)
: wxScrollHelperNative(this)
: wxScrollHelper(this)
{
Create(parent, winid, pos, size, style, name);
}

1249
src/generic/scrlwing.cpp
View File

File diff suppressed because it is too large Load Diff

38
src/gtk/scrolwin.cpp
View File

@ -36,10 +36,10 @@
// wxScrollHelper implementation
// ----------------------------------------------------------------------------
void wxScrollHelperNative::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY,
int xPos, int yPos,
bool noRefresh)
void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY,
int xPos, int yPos,
bool noRefresh)
{
int xs, ys;
GetViewStart(& xs, & ys);
@ -81,13 +81,13 @@ void wxScrollHelperNative::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
}
}
void wxScrollHelperNative::DoAdjustScrollbar(GtkRange* range,
int pixelsPerLine,
int winSize,
int virtSize,
int *pos,
int *lines,
int *linesPerPage)
void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,
int pixelsPerLine,
int winSize,
int virtSize,
int *pos,
int *lines,
int *linesPerPage)
{
int upper;
int page_size;
@ -119,7 +119,7 @@ void wxScrollHelperNative::DoAdjustScrollbar(GtkRange* range,
*pos = *lines;
}
void wxScrollHelperNative::AdjustScrollbars()
void wxScrollHelper::AdjustScrollbars()
{
int vw, vh;
m_targetWindow->GetVirtualSize(&vw, &vh);
@ -163,10 +163,10 @@ void wxScrollHelperNative::AdjustScrollbars()
}
}
void wxScrollHelperNative::DoScrollOneDir(int orient,
int pos,
int pixelsPerLine,
int *posOld)
void wxScrollHelper::DoScrollOneDir(int orient,
int pos,
int pixelsPerLine,
int *posOld)
{
if ( pos != -1 && pos != *posOld && pixelsPerLine )
{
@ -181,7 +181,7 @@ void wxScrollHelperNative::DoScrollOneDir(int orient,
}
}
void wxScrollHelperNative::DoScroll( int x_pos, int y_pos )
void wxScrollHelper::DoScroll( int x_pos, int y_pos )
{
wxCHECK_RET( m_targetWindow != 0, _T("No target window") );
@ -219,8 +219,8 @@ GtkPolicyType GtkPolicyFromWX(wxScrollbarVisibility visibility)
} // anonymous namespace
void wxScrollHelperNative::DoShowScrollbars(wxScrollbarVisibility horz,
wxScrollbarVisibility vert)
void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility horz,
wxScrollbarVisibility vert)
{
GtkScrolledWindow * const scrolled = GTK_SCROLLED_WINDOW(m_win->m_widget);
wxCHECK_RET( scrolled, "window must be created" );

20
src/gtk1/scrolwin.cpp
View File

@ -36,7 +36,7 @@
// wxScrollHelper implementation
// ----------------------------------------------------------------------------
void wxScrollHelperNative::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY,
int xPos, int yPos,
bool noRefresh)
@ -73,7 +73,7 @@ void wxScrollHelperNative::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
m_targetWindow->m_hasScrolling = pixelsPerUnitX || pixelsPerUnitY;
}
void wxScrollHelperNative::DoAdjustScrollbar(GtkAdjustment *adj,
void wxScrollHelper::DoAdjustScrollbar(GtkAdjustment *adj,
int pixelsPerLine,
int winSize,
int virtSize,
@ -127,7 +127,7 @@ void wxScrollHelperNative::DoAdjustScrollbar(GtkAdjustment *adj,
gtk_signal_emit_by_name( GTK_OBJECT(adj), "changed" );
}
void wxScrollHelperNative::AdjustScrollbars()
void wxScrollHelper::AdjustScrollbars()
{
int w, h;
int vw, vh;
@ -141,7 +141,7 @@ void wxScrollHelperNative::AdjustScrollbars()
&m_yScrollPosition, &m_yScrollLines, &m_yScrollLinesPerPage);
}
void wxScrollHelperNative::DoScroll(int orient,
void wxScrollHelper::DoScrollOneDir(int orient,
GtkAdjustment *adj,
int pos,
int pixelsPerLine,
@ -169,13 +169,19 @@ void wxScrollHelperNative::DoScroll(int orient,
}
}
void wxScrollHelperNative::Scroll( int x_pos, int y_pos )
void wxScrollHelper::DoScroll( int x_pos, int y_pos )
{
wxCHECK_RET( m_targetWindow != 0, _T("No target window") );
DoScroll(wxHORIZONTAL, m_win->m_hAdjust, x_pos, m_xScrollPixelsPerLine,
DoScrollOneDir(wxHORIZONTAL, m_win->m_hAdjust, x_pos, m_xScrollPixelsPerLine,
&m_xScrollPosition);
DoScroll(wxVERTICAL, m_win->m_vAdjust, y_pos, m_yScrollPixelsPerLine,
DoScrollOneDir(wxVERTICAL, m_win->m_vAdjust, y_pos, m_yScrollPixelsPerLine,
&m_yScrollPosition);
}
void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility WXUNUSED(horz),
wxScrollbarVisibility WXUNUSED(vert))
{
// TODO: not supported/implemented
}