#endif
#include "wx/generic/scrolwin.h"
+#include "wx/panel.h"
#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxScrolledWindow, wxWindow)
+BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
EVT_SCROLLWIN(wxScrolledWindow::OnScroll)
EVT_SIZE(wxScrolledWindow::OnSize)
EVT_PAINT(wxScrolledWindow::OnPaint)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
#endif
#ifdef __WXMSW__
m_yScrollLinesPerPage = 0;
m_scaleX = 1.0;
m_scaleY = 1.0;
+
+ m_targetWindow = this;
- return wxWindow::Create(parent, id, pos, size, style, name);
+ return wxPanel::Create(parent, id, pos, size, style, name);
}
/*
AdjustScrollbars();
if (do_refresh && !noRefresh)
- Refresh();
+ m_targetWindow->Refresh();
#ifdef __WXMSW__
// Necessary?
- UpdateWindow ((HWND) GetHWND());
+ UpdateWindow ((HWND) m_targetWindow->GetHWND());
+#endif
+#ifdef __WXMAC__
+ m_targetWindow->MacUpdateImmediately() ;
#endif
}
+wxScrolledWindow::~wxScrolledWindow()
+{
+}
+
+void wxScrolledWindow::SetTargetWindow( wxWindow *target )
+{
+ wxASSERT_MSG( target, wxT("target window must not be NULL") );
+ m_targetWindow = target;
+}
+
+wxWindow *wxScrolledWindow::GetTargetWindow()
+{
+ return m_targetWindow;
+}
+
void wxScrolledWindow::OnScroll(wxScrollWinEvent& event)
{
int orient = event.GetOrientation();
if (orient == wxHORIZONTAL)
{
if (m_xScrollingEnabled)
- ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, (const wxRect *) NULL);
+ m_targetWindow->ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, (const wxRect *) NULL);
else
- Refresh();
+ m_targetWindow->Refresh();
}
else
{
if (m_yScrollingEnabled)
- ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, (const wxRect *) NULL);
+ m_targetWindow->ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, (const wxRect *) NULL);
else
- Refresh();
+ m_targetWindow->Refresh();
}
+#ifdef __WXMAC__
+ m_targetWindow->MacUpdateImmediately() ;
+#endif
}
int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)
{
- int pos = event.GetPosition();
- int orient = event.GetOrientation();
+ int pos = event.GetPosition();
+ int orient = event.GetOrientation();
- int nScrollInc = 0;
- switch (event.GetEventType())
- {
- case wxEVT_SCROLLWIN_TOP:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = - m_xScrollPosition;
- else
- nScrollInc = - m_yScrollPosition;
- break;
- }
- case wxEVT_SCROLLWIN_BOTTOM:
+ int nScrollInc = 0;
+ switch (event.GetEventType())
{
- if (orient == wxHORIZONTAL)
- nScrollInc = m_xScrollLines - m_xScrollPosition;
- else
- nScrollInc = m_yScrollLines - m_yScrollPosition;
- break;
- }
- case wxEVT_SCROLLWIN_LINEUP:
- {
- nScrollInc = -1;
- break;
- }
- case wxEVT_SCROLLWIN_LINEDOWN:
- {
- nScrollInc = 1;
- break;
- }
- case wxEVT_SCROLLWIN_PAGEUP:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
- else
- nScrollInc = -GetScrollPageSize(wxVERTICAL);
- break;
- }
- case wxEVT_SCROLLWIN_PAGEDOWN:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = GetScrollPageSize(wxHORIZONTAL);
- else
- nScrollInc = GetScrollPageSize(wxVERTICAL);
- break;
- }
- case wxEVT_SCROLLWIN_THUMBTRACK:
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = pos - m_xScrollPosition;
- else
- nScrollInc = pos - m_yScrollPosition;
- break;
- }
- default:
- {
- break;
+ case wxEVT_SCROLLWIN_TOP:
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = - m_xScrollPosition;
+ else
+ nScrollInc = - m_yScrollPosition;
+ break;
+ }
+ case wxEVT_SCROLLWIN_BOTTOM:
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = m_xScrollLines - m_xScrollPosition;
+ else
+ nScrollInc = m_yScrollLines - m_yScrollPosition;
+ break;
+ }
+ case wxEVT_SCROLLWIN_LINEUP:
+ {
+ nScrollInc = -1;
+ break;
+ }
+ case wxEVT_SCROLLWIN_LINEDOWN:
+ {
+ nScrollInc = 1;
+ break;
+ }
+ case wxEVT_SCROLLWIN_PAGEUP:
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
+ else
+ nScrollInc = -GetScrollPageSize(wxVERTICAL);
+ break;
+ }
+ case wxEVT_SCROLLWIN_PAGEDOWN:
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = GetScrollPageSize(wxHORIZONTAL);
+ else
+ nScrollInc = GetScrollPageSize(wxVERTICAL);
+ break;
+ }
+ case wxEVT_SCROLLWIN_THUMBTRACK:
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = pos - m_xScrollPosition;
+ else
+ nScrollInc = pos - m_yScrollPosition;
+ break;
+ }
+ default:
+ {
+ break;
+ }
}
- }
- if (orient == wxHORIZONTAL)
- {
- if (m_xScrollPixelsPerLine > 0) {
- int w, h;
- GetClientSize(&w, &h);
-
- int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
- int noPositions = (int) ( ((nMaxWidth - w)/(float)m_xScrollPixelsPerLine) + 0.5 );
- if (noPositions < 0)
- noPositions = 0;
-
- if ( (m_xScrollPosition + nScrollInc) < 0 )
- nScrollInc = -m_xScrollPosition; // As -ve as we can go
- else if ( (m_xScrollPosition + nScrollInc) > noPositions )
- nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
+ if (orient == wxHORIZONTAL)
+ {
+ if (m_xScrollPixelsPerLine > 0)
+ {
+ int w, h;
+ m_targetWindow->GetClientSize(&w, &h);
+
+ int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
+ int noPositions = (int) ( ((nMaxWidth - w)/(double)m_xScrollPixelsPerLine) + 0.5 );
+ if (noPositions < 0)
+ noPositions = 0;
+
+ if ( (m_xScrollPosition + nScrollInc) < 0 )
+ nScrollInc = -m_xScrollPosition; // As -ve as we can go
+ else if ( (m_xScrollPosition + nScrollInc) > noPositions )
+ nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
+ }
+ else
+ m_targetWindow->Refresh();
}
else
- Refresh();
- }
- else
- {
- if (m_yScrollPixelsPerLine > 0) {
- int w, h;
- GetClientSize(&w, &h);
+ {
+ if (m_yScrollPixelsPerLine > 0)
+ {
+ int w, h;
+ m_targetWindow->GetClientSize(&w, &h);
- int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
- int noPositions = (int) ( ((nMaxHeight - h)/(float)m_yScrollPixelsPerLine) + 0.5 );
- if (noPositions < 0)
- noPositions = 0;
+ int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
+ int noPositions = (int) ( ((nMaxHeight - h)/(double)m_yScrollPixelsPerLine) + 0.5 );
+ if (noPositions < 0)
+ noPositions = 0;
- if ( (m_yScrollPosition + nScrollInc) < 0 )
- nScrollInc = -m_yScrollPosition; // As -ve as we can go
- else if ( (m_yScrollPosition + nScrollInc) > noPositions )
- nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
+ if ( (m_yScrollPosition + nScrollInc) < 0 )
+ nScrollInc = -m_yScrollPosition; // As -ve as we can go
+ else if ( (m_yScrollPosition + nScrollInc) > noPositions )
+ nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
+ }
+ else
+ m_targetWindow->Refresh();
}
- else
- Refresh();
- }
- return nScrollInc;
+ return nScrollInc;
}
// Adjust the scrollbars - new version.
-void wxScrolledWindow::AdjustScrollbars(void)
+void wxScrolledWindow::AdjustScrollbars()
{
int w, h;
- GetClientSize(&w, &h);
+ m_targetWindow->GetClientSize(&w, &h);
+
+ int oldXScroll = m_xScrollPosition;
+ int oldYScroll = m_yScrollPosition;
if (m_xScrollLines > 0)
{
// Calculate page size i.e. number of scroll units you get on the
// current client window
- int noPagePositions = (int) ( (w/(float)m_xScrollPixelsPerLine) + 0.5 );
+ int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
if (noPagePositions < 1) noPagePositions = 1;
// Correct position if greater than extent of canvas minus
{
// Calculate page size i.e. number of scroll units you get on the
// current client window
- int noPagePositions = (int) ( (h/(float)m_yScrollPixelsPerLine) + 0.5 );
+ int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
if (noPagePositions < 1) noPagePositions = 1;
// Correct position if greater than extent of canvas minus
m_yScrollPosition = 0;
SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE);
}
+
+ if (oldXScroll != m_xScrollPosition)
+ {
+ if (m_xScrollingEnabled)
+ m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll-m_xScrollPosition), 0, (const wxRect *) NULL );
+ else
+ m_targetWindow->Refresh();
+ }
+
+ if (oldYScroll != m_yScrollPosition)
+ {
+ if (m_yScrollingEnabled)
+ m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition), (const wxRect *) NULL );
+ else
+ m_targetWindow->Refresh();
+ }
}
// Default OnSize resets scrollbars, if any
*x_page = GetScrollPageSize(wxHORIZONTAL);
*y_page = GetScrollPageSize(wxVERTICAL);
}
-#endif
+
+void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const
+{
+ if ( xx )
+ *xx = (float)(x + m_xScrollPosition * m_xScrollPixelsPerLine);
+ if ( yy )
+ *yy = (float)(y + m_yScrollPosition * m_yScrollPixelsPerLine);
+}
+#endif // WXWIN_COMPATIBILITY
void wxScrolledWindow::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
{
- *x_unit = m_xScrollPixelsPerLine;
- *y_unit = m_yScrollPixelsPerLine;
+ if ( x_unit )
+ *x_unit = m_xScrollPixelsPerLine;
+ if ( y_unit )
+ *y_unit = m_yScrollPixelsPerLine;
}
int wxScrolledWindow::GetScrollPageSize(int orient) const
((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
int w, h;
- GetClientSize(&w, &h);
+ m_targetWindow->GetClientSize(&w, &h);
if (x_pos != -1)
{
+ int old_x = m_xScrollPosition;
m_xScrollPosition = x_pos;
// Calculate page size i.e. number of scroll units you get on the
// current client window
- int noPagePositions = (int) ( (w/(float)m_xScrollPixelsPerLine) + 0.5 );
+ int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
if (noPagePositions < 1) noPagePositions = 1;
// Correct position if greater than extent of canvas minus
m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition );
m_xScrollPosition = wxMax( 0, m_xScrollPosition );
- SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
+ m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
+
+ m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
}
if (y_pos != -1)
{
+ int old_y = m_yScrollPosition;
m_yScrollPosition = y_pos;
// Calculate page size i.e. number of scroll units you get on the
// current client window
- int noPagePositions = (int) ( (h/(float)m_yScrollPixelsPerLine) + 0.5 );
+ int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
if (noPagePositions < 1) noPagePositions = 1;
// Correct position if greater than extent of canvas minus
m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
m_yScrollPosition = wxMax( 0, m_yScrollPosition );
- SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
+ m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
+
+ m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
}
- // BAD, BAD, can cause event loops if called from OnPaint(). KB.
- // Refresh();
#ifdef __WXMSW__
- // Necessary?
- ::UpdateWindow ((HWND) GetHWND());
+// ::UpdateWindow ((HWND) GetHWND());
+#else
+// Refresh();
+#endif
+#ifdef __WXMAC__
+ m_targetWindow->MacUpdateImmediately() ;
#endif
}
void wxScrolledWindow::GetVirtualSize (int *x, int *y) const
{
- *x = m_xScrollPixelsPerLine * m_xScrollLines;
- *y = m_yScrollPixelsPerLine * m_yScrollLines;
+ if ( x )
+ *x = m_xScrollPixelsPerLine * m_xScrollLines;
+ if ( y )
+ *y = m_yScrollPixelsPerLine * m_yScrollLines;
}
// Where the current view starts from
void wxScrolledWindow::ViewStart (int *x, int *y) const
{
- *x = m_xScrollPosition;
- *y = m_yScrollPosition;
+ if ( x )
+ *x = m_xScrollPosition;
+ if ( y )
+ *y = m_yScrollPosition;
}
void wxScrolledWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
{
- *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
- *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
+ if ( xx )
+ *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
+ if ( yy )
+ *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
}
-void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const
+void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
{
- *xx = (float)(x + m_xScrollPosition * m_xScrollPixelsPerLine);
- *yy = (float)(y + m_yScrollPosition * m_yScrollPixelsPerLine);
+ if ( xx )
+ *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
+ if ( yy )
+ *yy = y + m_yScrollPosition * m_yScrollPixelsPerLine;
}
-
-
projects / wxWidgets.git / blobdiff