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 7531023db5170f22f9b70374e05384b56d744757..b4bdcd15cf0c4d6822ae4f30b4b3f105479c7f8f 100644 (file)
--- 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_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
 
     /*
      * 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_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
 
     /*
      * System events