[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 756
Date       : Sat Apr  1 16:48:38 BST 2006

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

Fixed sliders so they issue the correct message


Diff:
Index: Trunk/XaraLX/configure.in
===================================================================
--- Trunk/XaraLX/configure.in	(revision 755)
+++ Trunk/XaraLX/configure.in	(revision 756)
@@ -147,7 +147,7 @@
 	fi
 
 else
-	AC_MSG_ERROR([wxWidgets 2.6.3 or newer is required (2.6.3-rc2 will do)])
+	AC_MSG_ERROR([wxWidgets 2.6.3 or newer is required])
 fi
 
 FTCONFIG=freetype-config
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 755)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 756)
@@ -812,7 +812,7 @@
 		(EventType == wxEVT_COMMAND_SPINCTRL_UPDATED) ||
 		(EventType == wxEVT_SCROLL_CHANGED) ||
 		(EventType == wxEVT_SCROLL_THUMBTRACK) ||
-		(EventType == wxEVT_SCROLL_THUMBRELEASE) ||
+		((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) ||
@@ -836,17 +836,13 @@
 		(EventType == wxEVT_COMMAND_SLIDER_UPDATED) ||
 		FALSE)
 	{
-		// Right now we don't seem to be able to track slider release under GTK, so make
-		// everything generate a Set event (SLOW!) until this is fixed. Unfortunately some
-		// this seem to want a Slider Changing first, so we have to send two. How tiresome.
-		 msg.DlgMsg = DIM_SLIDER_POS_CHANGING;
-
-		// We should send the message out later - we use the same ID
-		wxCamDialogEvent deferredevent (wxEVT_CAMDIALOG_DEFERREDMSG, event.GetId(), msg);
-		deferredevent.SetEventObject(pEvtHandler->pwxWindow);
-		// set it for processing later
-		pEvtHandler->pwxWindow->GetEventHandler()->AddPendingEvent(deferredevent);
-
+		msg.DlgMsg = DIM_SLIDER_POS_CHANGING;
+		HandleMessage = TRUE;
+	}
+	else if(
+		((EventType == wxEVT_SCROLL_THUMBRELEASE) && (pGadget && pGadget->IsKindOf(CLASSINFO(wxSlider)))) || // Handle slider THUMB_RELEASE here
+		FALSE)
+	{
 		msg.DlgMsg = DIM_SLIDER_POS_SET;
 		HandleMessage = TRUE;
 	}


Xara