[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 775
Date       : Wed Apr  5 20:07:32 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/dlgmgr.cpp

Fix slider message ordering


Diff:
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 774)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 775)
@@ -810,13 +810,15 @@
 		(EventType == wxEVT_COMMAND_VLBOX_SELECTED) ||
 		(EventType == wxEVT_COMMAND_COMBOBOX_SELECTED) ||
 		(EventType == wxEVT_COMMAND_SPINCTRL_UPDATED) ||
-		(EventType == wxEVT_SCROLL_CHANGED) ||
-		(EventType == wxEVT_SCROLL_THUMBTRACK) ||
-		((EventType == wxEVT_SCROLL_THUMBRELEASE) && !(pGadget && pGadget->IsKindOf(CLASSINFO(wxSlider)))) || // Don't handle slider THUMB_RELEASE here
-		(EventType == wxEVT_SCROLL_LINEUP) ||
-		(EventType == wxEVT_SCROLL_LINEDOWN) ||
-		(EventType == wxEVT_SCROLL_PAGEUP) ||
-		(EventType == wxEVT_SCROLL_PAGEDOWN) ||
+		((
+		  (EventType == wxEVT_SCROLL_CHANGED) || 
+		  (EventType == wxEVT_SCROLL_THUMBTRACK) || 
+		  (EventType == wxEVT_SCROLL_THUMBRELEASE) ||
+		  (EventType == wxEVT_SCROLL_LINEUP) ||
+		  (EventType == wxEVT_SCROLL_LINEDOWN) ||
+		  (EventType == wxEVT_SCROLL_PAGEUP) ||
+		  (EventType == wxEVT_SCROLL_PAGEDOWN)
+		) && !(pGadget && pGadget->IsKindOf(CLASSINFO(wxSlider)))) || // Don't handle slider scroll stuff here
 		(EventType == wxEVT_COMMAND_TREE_SEL_CHANGED) ||
 		FALSE)
 	{
@@ -833,14 +835,19 @@
 		HandleMessage = TRUE;
 	}
 	else if(
-		(EventType == wxEVT_COMMAND_SLIDER_UPDATED) ||
+		(( (EventType == wxEVT_SCROLL_THUMBTRACK) ||
+		   (EventType == wxEVT_SCROLL_LINEUP) ||
+		   (EventType == wxEVT_SCROLL_LINEDOWN) ||
+		   (EventType == wxEVT_SCROLL_PAGEUP) ||
+		   (EventType == wxEVT_SCROLL_PAGEDOWN)
+		 ) && (pGadget && pGadget->IsKindOf(CLASSINFO(wxSlider)))) || // Handle slider movements - note SCROLL_CHANGED always comes later
 		FALSE)
 	{
 		msg.DlgMsg = DIM_SLIDER_POS_CHANGING;
 		HandleMessage = TRUE;
 	}
 	else if(
-		((EventType == wxEVT_SCROLL_THUMBRELEASE) && (pGadget && pGadget->IsKindOf(CLASSINFO(wxSlider)))) || // Handle slider THUMB_RELEASE here
+		((EventType == wxEVT_SCROLL_CHANGED) && (pGadget && pGadget->IsKindOf(CLASSINFO(wxSlider)))) || // Handle slider changes
 		FALSE)
 	{
 		msg.DlgMsg = DIM_SLIDER_POS_SET;


Xara