From: Vadim Zeitlin Date: Tue, 15 Feb 2000 09:53:53 +0000 (+0000) Subject: oops... another incorrectly resolved cvs conflict X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7ead72f2ff8cec4984279c1709d2f19daf95982d oops... another incorrectly resolved cvs conflict git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/event.h b/include/wx/event.h index 7531023db5..b4bdcd15cf 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -128,6 +128,7 @@ enum wxEVT_SCROLL_PAGEUP = wxEVT_FIRST + 304, wxEVT_SCROLL_PAGEDOWN = wxEVT_FIRST + 305, wxEVT_SCROLL_THUMBTRACK = wxEVT_FIRST + 306, + wxEVT_SCROLL_THUMBRELEASE = wxEVT_FIRST + 307, /* * Scroll events from wxWindow @@ -139,7 +140,7 @@ enum wxEVT_SCROLLWIN_PAGEUP = wxEVT_FIRST + 324, wxEVT_SCROLLWIN_PAGEDOWN = wxEVT_FIRST + 325, wxEVT_SCROLLWIN_THUMBTRACK = wxEVT_FIRST + 326, - wxEVT_SCROLL_THUMBRELEASE = wxEVT_FIRST + 327, + wxEVT_SCROLLWIN_THUMBRELEASE = wxEVT_FIRST + 327, /* * System events