AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oops... another incorrectly resolved cvs conflict

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-02-15 09:53:53 +00:00
parent 9e91a33c46
commit 7ead72f2ff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/event.h
View File

@ -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