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

generate EVT_SCROLL events for the standalong scrollbars, not EVT_SCROLLWIN

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-16 10:45:49 +00:00
parent 7882729eb5
commit c7beb04848
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/univ/scrolbar.h
View File

@@ -126,7 +126,7 @@ protected:
// event handlers // event handlers
void OnIdle(wxIdleEvent& event); void OnIdle(wxIdleEvent& event);
// forces update of thumb's visual appearence (does nothing if m_dirty=FALSE) // forces update of thumb's visual appearence (does nothing if m_dirty=FALSE)
void UpdateThumb(); void UpdateThumb();
@@ -136,6 +136,9 @@ protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
// is this scrollbar attached to a window or a standalone control?
bool IsStandalone() const;
private: private:
// total range of the scrollbar in logical units // total range of the scrollbar in logical units
int m_range; int m_range;

42
src/univ/scrolbar.cpp
View File

@@ -165,22 +165,26 @@ wxScrollBar::~wxScrollBar()
{ {
} }
// ----------------------------------------------------------------------------
// misc accessors
// ----------------------------------------------------------------------------
bool wxScrollBar::IsStandalone() const
{
wxWindow *parent = GetParent();
if ( !parent )
{
return TRUE;
}
return (parent->GetScrollbar(wxHORIZONTAL) != this) &&
(parent->GetScrollbar(wxVERTICAL) != this);
}
bool wxScrollBar::AcceptsFocus() const bool wxScrollBar::AcceptsFocus() const
{ {
if (!wxWindow::AcceptsFocus()) return FALSE; // the window scrollbars never accept focus
return wxScrollBarBase::AcceptsFocus() && IsStandalone();
wxWindow *parent = (wxWindow*) GetParent();
if (parent)
{
if ((parent->GetScrollbar( wxHORIZONTAL ) == this) ||
(parent->GetScrollbar( wxVERTICAL ) == this))
{
return FALSE;
}
}
return TRUE;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -543,6 +547,16 @@ bool wxScrollBar::PerformAction(const wxControlAction& action,
bool changed = m_thumbPos != thumbOld; bool changed = m_thumbPos != thumbOld;
if ( notify || changed ) if ( notify || changed )
{ {
if ( IsStandalone() )
{
// we should generate EVT_SCROLL events for the standalone
// scrollbars and not the EVT_SCROLLWIN ones
//
// NB: we assume that scrollbar events are sequentially numbered
// but this should be ok as other code relies on this as well
scrollType += wxEVT_SCROLL_TOP - wxEVT_SCROLLWIN_TOP;
}
wxScrollWinEvent event(scrollType, m_thumbPos, wxScrollWinEvent event(scrollType, m_thumbPos,
IsVertical() ? wxVERTICAL : wxHORIZONTAL); IsVertical() ? wxVERTICAL : wxHORIZONTAL);
event.SetEventObject(this); event.SetEventObject(this);