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

Corrected mouse wheel support.

Browse Source 
Prevent wxWindow::SetScrollPos() and ::SetScrollbar
    from emitting the wxScrollWinEvent
  Call wxWindow::Update() in ScrollWindow() as the
    update region would otherwise be out of sync


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-06-23 15:48:31 +00:00
parent 0d5d808ece
commit 8639c0ea73
1 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gtk/window.cpp
View File

@@ -1268,15 +1268,6 @@ template<typename T> void InitMouseEvent(wxWindowGTK *win,
event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK);
event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK);
event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK);
if (event.GetEventType() == wxEVT_MOUSEWHEEL)
{
event.m_linesPerAction = 3;
event.m_wheelDelta = 120;
if (((GdkEventButton*)gdk_event)->button == 4)
event.m_wheelRotation = 120;
else if (((GdkEventButton*)gdk_event)->button == 5)
event.m_wheelRotation = -120;
}
wxPoint pt = win->GetClientAreaOrigin();
event.m_x = (wxCoord)gdk_event->x - pt.x;
@@ -1575,13 +1566,6 @@ gtk_window_button_press_callback( GtkWidget *widget,
;
}
}
else if (gdk_event->button == 4 || gdk_event->button == 5)
{
if (gdk_event->type == GDK_BUTTON_PRESS )
{
event_type = wxEVT_MOUSEWHEEL;
}
}
if ( event_type == wxEVT_NULL )
{
@@ -1766,7 +1750,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget,
}
//-----------------------------------------------------------------------------
// "scroll_event", (mouse wheel event)
// "scroll_event" (mouse wheel event)
//-----------------------------------------------------------------------------
static gboolean
@@ -2031,9 +2015,7 @@ gtk_scrollbar_value_changed(GtkRange* range, wxWindow* win)
wxScrollWinEvent event(eventType, win->GetScrollPos(orient), orient);
event.SetEventObject(win);
win->m_blockValueChanged[dir] = true;
win->GTKProcessEvent(event);
win->m_blockValueChanged[dir] = false;
}
}
@@ -2389,8 +2371,8 @@ bool wxWindowGTK::Create( wxWindow *parent,
g_signal_handler_block(m_scrollBar[dir], handler_id);
// these handlers get notified when scrollbar slider moves
g_signal_connect(m_scrollBar[dir], "value_changed",
G_CALLBACK(gtk_scrollbar_value_changed), this);
g_signal_connect_after(m_scrollBar[dir], "value_changed",
G_CALLBACK(gtk_scrollbar_value_changed), this);
}
gtk_widget_show( m_wxwindow );
@@ -4161,11 +4143,13 @@ void wxWindowGTK::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
pos = 0;
m_scrollPos[dir] = adj->value = pos;
// If a "value_changed" signal emission is not already in progress
if (!m_blockValueChanged[dir])
{
gtk_adjustment_value_changed(adj);
}
g_signal_handlers_disconnect_by_func( m_scrollBar[dir],
(gpointer)gtk_scrollbar_value_changed, this);
gtk_adjustment_value_changed(adj);
g_signal_connect_after(m_scrollBar[dir], "value_changed",
G_CALLBACK(gtk_scrollbar_value_changed), this);
}
}
@@ -4258,6 +4242,8 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
// No scrolling requested.
if ((dx == 0) && (dy == 0)) return;
Update();
m_clipPaintRegion = true;