X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13ff9344d600ab38ad5ad4088d4a4797184405d2..cd5e9298159e58f57e05f3b76c9d4a45e1eefe12:/src/gtk1/scrolwin.cpp?ds=sidebyside diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp index 1ed216acf6..175fb3494d 100644 --- a/src/gtk1/scrolwin.cpp +++ b/src/gtk1/scrolwin.cpp @@ -31,10 +31,11 @@ #include "wx/utils.h" #include "wx/dcclient.h" -#include "wx/gtk/scrolwin.h" +#include "wx/scrolwin.h" #include "wx/panel.h" +#include "wx/sizer.h" -#include +#include "wx/gtk/private.h" #include "wx/gtk/win_gtk.h" // ---------------------------------------------------------------------------- @@ -72,7 +73,9 @@ extern bool g_isIdle; // "value_changed" from m_vAdjust //----------------------------------------------------------------------------- -static void gtk_scrolled_window_vscroll_callback( GtkAdjustment *adjust, wxScrolledWindow *win ) +static void gtk_scrolled_window_vscroll_callback( GtkAdjustment *adjust, + SCROLLBAR_CBACK_ARG + wxScrolledWindow *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -81,14 +84,17 @@ static void gtk_scrolled_window_vscroll_callback( GtkAdjustment *adjust, wxScrol if (!win->m_hasVMT) return; - win->GtkVScroll( adjust->value ); + win->GtkVScroll( adjust->value, + GET_SCROLL_TYPE(GTK_SCROLLED_WINDOW(win->m_widget)->vscrollbar) ); } //----------------------------------------------------------------------------- // "value_changed" from m_hAdjust //----------------------------------------------------------------------------- -static void gtk_scrolled_window_hscroll_callback( GtkAdjustment *adjust, wxScrolledWindow *win ) +static void gtk_scrolled_window_hscroll_callback( GtkAdjustment *adjust, + SCROLLBAR_CBACK_ARG + wxScrolledWindow *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -96,7 +102,8 @@ static void gtk_scrolled_window_hscroll_callback( GtkAdjustment *adjust, wxScrol if (g_blockEventsOnDrag) return; if (!win->m_hasVMT) return; - win->GtkHScroll( adjust->value ); + win->GtkHScroll( adjust->value, + GET_SCROLL_TYPE(GTK_SCROLLED_WINDOW(win->m_widget)->hscrollbar) ); } //----------------------------------------------------------------------------- @@ -111,7 +118,11 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget, wxapp_install_idle_handler(); g_blockEventsOnScroll = TRUE; + + // FIXME: there is no slider field any more, what was meant here? +#ifndef __WXGTK20__ win->m_isScrolling = (gdk_event->window == widget->slider); +#endif return FALSE; } @@ -298,7 +309,7 @@ bool wxScrolledWindow::Create(wxWindow *parent, if (m_parent) m_parent->DoAddChild( this ); - + m_focusWidget = m_wxwindow; PostCreation(); @@ -322,7 +333,7 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY, { int old_x = m_xScrollPixelsPerLine * m_xScrollPosition; int old_y = m_yScrollPixelsPerLine * m_yScrollPosition; - + m_xScrollPixelsPerLine = pixelsPerUnitX; m_yScrollPixelsPerLine = pixelsPerUnitY; m_xScrollLines = noUnitsX; @@ -341,14 +352,14 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY, m_vAdjust->value = yPos; m_vAdjust->step_increment = 1.0; m_vAdjust->page_increment = 2.0; - + AdjustScrollbars(); - + if (!noRefresh) { int new_x = m_xScrollPixelsPerLine * m_xScrollPosition; int new_y = m_yScrollPixelsPerLine * m_yScrollPosition; - + m_targetWindow->ScrollWindow( old_x-new_x, old_y-new_y ); } } @@ -512,7 +523,9 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos ) } } -void wxScrolledWindow::GtkVScroll( float value ) +// TODO: [VH]Scroll functions should be combined + +void wxScrolledWindow::GtkVScroll( float value, unsigned int scroll_type ) { if (!m_targetWindow) return; @@ -525,21 +538,14 @@ void wxScrolledWindow::GtkVScroll( float value ) if (y_pos == m_yScrollPosition) return; - GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget); - GtkRange *range = GTK_RANGE(scrolledWindow->vscrollbar); - - wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK; - if (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLLWIN_LINEUP; - else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLLWIN_LINEDOWN; - else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLLWIN_PAGEUP; - else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLLWIN_PAGEDOWN; + wxEventType command = GtkScrollWinTypeToWx(scroll_type); wxScrollWinEvent event( command, y_pos, wxVERTICAL ); event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); } -void wxScrolledWindow::GtkHScroll( float value ) +void wxScrolledWindow::GtkHScroll( float value, unsigned int scroll_type ) { if (!m_targetWindow) return; @@ -552,14 +558,7 @@ void wxScrolledWindow::GtkHScroll( float value ) if (x_pos == m_xScrollPosition) return; - GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget); - GtkRange *range = GTK_RANGE(scrolledWindow->hscrollbar); - - wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK; - if (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLLWIN_LINEUP; - else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLLWIN_LINEDOWN; - else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLLWIN_PAGEUP; - else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLLWIN_PAGEDOWN; + wxEventType command = GtkScrollWinTypeToWx(scroll_type); wxScrollWinEvent event( command, x_pos, wxHORIZONTAL ); event.SetEventObject( this ); @@ -589,7 +588,7 @@ void wxScrolledWindow::GetViewStart (int *x, int *y) const *y = m_yScrollPosition; } -void wxScrolledWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const +void wxScrolledWindow::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const { if ( xx ) *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine; @@ -597,7 +596,7 @@ void wxScrolledWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) cons *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine; } -void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const +void wxScrolledWindow::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const { if ( xx ) *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine; @@ -690,7 +689,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event) return nScrollInc; } -void wxScrolledWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) +void wxScrolledWindow::SetScrollPos( int orient, int pos, bool refresh ) { wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); @@ -762,6 +761,22 @@ void wxScrolledWindow::GtkVDisconnectEvent() (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this ); } + +bool wxScrolledWindow::Layout() +{ + if (GetSizer()) + { + // Take into account the virtual size and scrolled position of the window + int x, y, w, h; + CalcScrolledPosition(0,0, &x,&y); + GetVirtualSize(&w, &h); + GetSizer()->SetDimension(x, y, w, h); + return TRUE; + } + else + return wxPanel::Layout(); // fall back to default for LayoutConstraints +} + // ---------------------------------------------------------------------------- // event handlers // ----------------------------------------------------------------------------