#endif
#endif
-#ifndef __WXGTK__
IMPLEMENT_CLASS(wxScrolledWindow, wxGenericScrolledWindow)
-#endif
// ----------------------------------------------------------------------------
// wxScrollHelperEvtHandler: intercept the events from the window and forward
// them to wxScrollHelper
// ----------------------------------------------------------------------------
-class wxScrollHelperEvtHandler : public wxEvtHandler
+class WXDLLEXPORT wxScrollHelperEvtHandler : public wxEvtHandler
{
public:
wxScrollHelperEvtHandler(wxScrollHelper *scrollHelper)
virtual bool ProcessEvent(wxEvent& event);
+ void ResetDrawnFlag() { m_hasDrawnWindow = FALSE; }
+
private:
wxScrollHelper *m_scrollHelper;
+
+ bool m_hasDrawnWindow;
};
// ----------------------------------------------------------------------------
bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
{
+ wxEventType evType = event.GetEventType();
+
+ // always process the size events ourselves, even if the user code handles
+ // them as well, as we need to AdjustScrollbars()
+ if ( evType == wxEVT_SIZE )
+ {
+ m_scrollHelper->HandleOnSize((wxSizeEvent &)event);
+ }
+
+ // the explanation of wxEVT_PAINT processing hack: for historic reasons
+ // there are 2 ways to process this event in classes deriving from
+ // wxScrolledWindow. The user code may
+ //
+ // 1. override wxScrolledWindow::OnDraw(dc)
+ // 2. define its own OnPaint() handler
+ //
+ // In addition, in wxUniversal wxWindow defines OnPaint() itself and
+ // always processes the draw event, so we can't just try the window
+ // OnPaint() first and call our HandleOnPaint() if it doesn't process it
+ // (the latter would never be called in wxUniversal).
+ //
+ // So the solution is to have a flag telling us whether the user code drew
+ // anything in the window. We set it to true here but reset it to false in
+ // wxScrolledWindow::OnPaint() handler (which wouldn't be called if the
+ // user code defined OnPaint() in the derived class)
+ m_hasDrawnWindow = TRUE;
+
if ( wxEvtHandler::ProcessEvent(event) )
- return TRUE;
+ {
+ // normally, nothing more to do here - except if it was a paint event
+ // which wasn't really processed, then we'll try to call our
+ // OnDraw() below (from HandleOnPaint)
+ if ( !m_hasDrawnWindow )
+ {
+ return TRUE;
+ }
+ }
// reset the skipped flag to FALSE as it might have been set to TRUE in
// ProcessEvent() above
event.Skip(FALSE);
- wxEventType evType = event.GetEventType();
-
if ( evType == wxEVT_PAINT )
{
m_scrollHelper->HandleOnPaint((wxPaintEvent &)event);
m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
}
#endif // wxUSE_MOUSEWHEEL
- else if ( evType == wxEVT_SIZE )
- {
- m_scrollHelper->HandleOnSize((wxSizeEvent &)event);
- }
else if ( evType == wxEVT_CHAR )
{
m_scrollHelper->HandleOnChar((wxKeyEvent &)event);
m_timerAutoScroll = (wxTimer *)NULL;
+ m_handler = NULL;
+
if ( win )
SetWindow(win);
}
-void wxScrollHelper::SetWindow(wxWindow *win)
-{
- wxCHECK_RET( win, _T("wxScrollHelper needs a window to scroll") );
-
- m_targetWindow = m_win = win;
-
- // install the event handler which will intercept the events we're
- // interested in
- m_win->PushEventHandler(new wxScrollHelperEvtHandler(this));
-}
-
wxScrollHelper::~wxScrollHelper()
{
StopAutoScrolling();
- if ( m_targetWindow )
- m_targetWindow->PopEventHandler(TRUE /* do delete it */);
+ DeleteEvtHandler();
}
// ----------------------------------------------------------------------------
int totalPixelWidth = m_xScrollLines * m_xScrollPixelsPerLine;
int totalPixelHeight = m_yScrollLines * m_yScrollPixelsPerLine;
- if (m_targetWindow->m_backingPixmap &&
- !((m_targetWindow->m_pixmapWidth == totalPixelWidth) &&
- (m_targetWindow->m_pixmapHeight == totalPixelHeight)))
+ if (m_targetWindow->GetBackingPixmap() &&
+ !((m_targetWindow->GetPixmapWidth() == totalPixelWidth) &&
+ (m_targetWindow->GetPixmapHeight() == totalPixelHeight)))
{
- XFreePixmap (dpy, (Pixmap) m_targetWindow->m_backingPixmap);
- m_targetWindow->m_backingPixmap = (WXPixmap) 0;
+ XFreePixmap (dpy, (Pixmap) m_targetWindow->GetBackingPixmap());
+ m_targetWindow->SetBackingPixmap((WXPixmap) 0);
}
- if (!m_targetWindow->m_backingPixmap &&
+ if (!m_targetWindow->GetBackingPixmap() &&
(noUnitsX != 0) && (noUnitsY != 0))
{
int depth = wxDisplayDepth();
- m_pixmapWidth = totalPixelWidth;
- m_pixmapHeight = totalPixelHeight;
- m_backingPixmap = (WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
- m_pixmapWidth, m_pixmapHeight, depth);
+ m_targetWindow->SetPixmapWidth(totalPixelWidth);
+ m_targetWindow->SetPixmapHeight(totalPixelHeight);
+ m_targetWindow->SetBackingPixmap((WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
+ m_targetWindow->GetPixmapWidth(), m_targetWindow->GetPixmapHeight(), depth));
}
}
// target window handling
// ----------------------------------------------------------------------------
-void wxScrollHelper::SetTargetWindow( wxWindow *target )
+void wxScrollHelper::DeleteEvtHandler()
+{
+ // FIXME: we should search for m_handler in the handler list
+ if ( m_targetWindow )
+ {
+ m_targetWindow->PopEventHandler(TRUE /* Delete old event handler*/);
+ }
+}
+
+void wxScrollHelper::SetWindow(wxWindow *win)
+{
+ wxCHECK_RET( win, _T("wxScrollHelper needs a window to scroll") );
+
+ m_win = win;
+
+ DoSetTargetWindow(win);
+}
+
+void wxScrollHelper::DoSetTargetWindow(wxWindow *target)
{
- wxASSERT_MSG( target, wxT("target window must not be NULL") );
m_targetWindow = target;
+
+ // install the event handler which will intercept the events we're
+ // interested in
+ m_handler = new wxScrollHelperEvtHandler(this);
+ m_targetWindow->PushEventHandler(m_handler);
+}
+
+void wxScrollHelper::SetTargetWindow( wxWindow *target )
+{
+ wxCHECK_RET( target, wxT("target window must not be NULL") );
+
+ if ( target == m_targetWindow )
+ return;
+
+ DeleteEvtHandler();
+
+ DoSetTargetWindow(target);
}
wxWindow *wxScrollHelper::GetTargetWindow() const
if (orient == wxHORIZONTAL)
{
m_xScrollPosition += nScrollInc;
- m_targetWindow->SetScrollPos(wxHORIZONTAL, m_xScrollPosition, FALSE);
+ m_targetWindow->SetScrollPos(wxHORIZONTAL, m_xScrollPosition);
}
else
{
m_yScrollPosition += nScrollInc;
- m_targetWindow->SetScrollPos(wxVERTICAL, m_yScrollPosition, FALSE);
+ m_targetWindow->SetScrollPos(wxVERTICAL, m_yScrollPosition);
}
bool needsRefresh = FALSE;
m_xScrollPosition = wxMax( 0, m_xScrollPosition );
if (old_x != m_xScrollPosition) {
- m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, FALSE );
+ m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition );
m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0,
GetRect() );
}
m_yScrollPosition = wxMax( 0, m_yScrollPosition );
if (old_y != m_yScrollPosition) {
- m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, FALSE );
+ m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition );
m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine,
GetRect() );
}
szy = -1;
}
+ int xScrollOld = m_xScrollPosition,
+ yScrollOld = m_yScrollPosition;
+
int dsty;
switch ( event.KeyCode() )
{
// not for us
event.Skip();
}
+
+ if ( m_xScrollPosition != xScrollOld )
+ {
+ wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBTRACK, m_xScrollPosition,
+ wxHORIZONTAL);
+ event.SetEventObject(m_win);
+ m_win->GetEventHandler()->ProcessEvent(event);
+ }
+
+ if ( m_yScrollPosition != yScrollOld )
+ {
+ wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBTRACK, m_yScrollPosition,
+ wxVERTICAL);
+ event.SetEventObject(m_win);
+ m_win->GetEventHandler()->ProcessEvent(event);
+ }
}
// ----------------------------------------------------------------------------
{
lines *= event.GetLinesPerAction();
- int vsx, vsy;
- GetViewStart(&vsx, &vsy);
- Scroll(-1, vsy - lines);
+ wxScrollWinEvent newEvent;
+
+ newEvent.SetPosition(0);
+ newEvent.SetOrientation(wxVERTICAL);
+ newEvent.m_eventObject = m_win;
+ if (lines > 0)
+ newEvent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+ else
+ newEvent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+
+ int times = abs(lines);
+ for (; times > 0; times --)
+ m_win->GetEventHandler()->ProcessEvent(newEvent);
+
+ /* Old Way */
+ // int vsx, vsy;
+ // GetViewStart(&vsx, &vsy);
+ // Scroll(-1, vsy - lines);
}
}
IMPLEMENT_DYNAMIC_CLASS(wxGenericScrolledWindow, wxPanel)
+BEGIN_EVENT_TABLE(wxGenericScrolledWindow, wxPanel)
+ EVT_PAINT(wxGenericScrolledWindow::OnPaint)
+END_EVENT_TABLE()
+
bool wxGenericScrolledWindow::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
{
}
+void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
+{
+ // the user code didn't really draw the window if we got here, so set this
+ // flag to try to call OnDraw() later
+ m_handler->ResetDrawnFlag();
+
+ event.Skip();
+}
+
#if WXWIN_COMPATIBILITY
+
void wxGenericScrolledWindow::GetScrollUnitsPerPage (int *x_page, int *y_page) const
{
*x_page = GetScrollPageSize(wxHORIZONTAL);
if ( yy )
*yy = (float)(y + m_yScrollPosition * m_yScrollPixelsPerLine);
}
+
#endif // WXWIN_COMPATIBILITY
#endif // !wxGTK
projects / wxWidgets.git / blobdiff