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

revert slop from previous commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-01-08 16:54:04 +00:00
parent 94a007ece4
commit 35510e483f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/window.cpp
View File

@@ -1570,7 +1570,7 @@ window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow*
delta = -delta; delta = -delta;
gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size); gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);
gtk_adjustment_set_value (adj, new_value); gtk_adjustment_set_value (adj, new_value);
return TRUE; return TRUE;
@@ -1601,7 +1601,7 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
if (win->GTKProcessEvent(event)) if (win->GTKProcessEvent(event))
return TRUE; return TRUE;
GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert];
if (!range) return FALSE; if (!range) return FALSE;
@@ -1613,7 +1613,7 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
delta = -delta; delta = -delta;
gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size); gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);
gtk_adjustment_set_value (adj, new_value); gtk_adjustment_set_value (adj, new_value);
return TRUE; return TRUE;
@@ -1759,7 +1759,7 @@ gtk_scrollbar_value_changed(GtkRange* range, wxWindow* win)
// find the scrollbar which generated the event // find the scrollbar which generated the event
wxWindowGTK::ScrollDir dir = win->ScrollDirFromRange(range); wxWindowGTK::ScrollDir dir = win->ScrollDirFromRange(range);
// generate the corresponding wx event // generate the corresponding wx event
const int orient = wxWindow::OrientFromScrollDir(dir); const int orient = wxWindow::OrientFromScrollDir(dir);
wxScrollWinEvent event(eventType, win->GetScrollPos(orient), orient); wxScrollWinEvent event(eventType, win->GetScrollPos(orient), orient);
@@ -2408,7 +2408,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
G_CALLBACK (gtk_window_button_release_callback), this); G_CALLBACK (gtk_window_button_release_callback), this);
g_signal_connect (widget, "motion_notify_event", g_signal_connect (widget, "motion_notify_event",
G_CALLBACK (gtk_window_motion_notify_callback), this); G_CALLBACK (gtk_window_motion_notify_callback), this);
g_signal_connect (widget, "scroll_event", g_signal_connect (widget, "scroll_event",
G_CALLBACK (window_scroll_event), this); G_CALLBACK (window_scroll_event), this);
if (m_scrollBar[ScrollDir_Horz]) if (m_scrollBar[ScrollDir_Horz])
@@ -2417,7 +2417,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
if (m_scrollBar[ScrollDir_Vert]) if (m_scrollBar[ScrollDir_Vert])
g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event", g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event",
G_CALLBACK (window_scroll_event), this); G_CALLBACK (window_scroll_event), this);
g_signal_connect (widget, "popup_menu", g_signal_connect (widget, "popup_menu",
G_CALLBACK (wxgtk_window_popup_menu_callback), this); G_CALLBACK (wxgtk_window_popup_menu_callback), this);
g_signal_connect (widget, "enter_notify_event", g_signal_connect (widget, "enter_notify_event",
@@ -4157,7 +4157,7 @@ void wxWindowGTK::SetScrollbar(int orient,
GtkAdjustment * const adj = sb->adjustment; GtkAdjustment * const adj = sb->adjustment;
adj->step_increment = 1; adj->step_increment = 1;
adj->page_increment = adj->page_increment =
adj->page_size = thumbVisible; adj->page_size = thumbVisible;
adj->value = pos; adj->value = pos;
@@ -4276,7 +4276,7 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
// No scrolling requested. // No scrolling requested.
if ((dx == 0) && (dy == 0)) return; if ((dx == 0) && (dy == 0)) return;
m_clipPaintRegion = true; m_clipPaintRegion = true;
WX_PIZZA(m_wxwindow)->scroll(dx, dy); WX_PIZZA(m_wxwindow)->scroll(dx, dy);