[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1344
Date       : Tue Jun 20 20:52:03 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/colpick.cpp
   M /Trunk/XaraLX/wxXtra/platform.cpp
   M /Trunk/XaraLX/wxXtra/platform.h

Tweak the current colour editor sizing Yield bodge


Diff:
Index: Trunk/XaraLX/wxXtra/platform.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/platform.cpp	(revision 1343)
+++ Trunk/XaraLX/wxXtra/platform.cpp	(revision 1344)
@@ -83,3 +83,16 @@
 
 #endif
 
+void wxPlatformDependent::RealYield()
+{
+#if defined( __WXGTK__ )
+    int i=0;
+    do
+    {
+        gdk_flush();
+        ::wxYield();
+    } while (gtk_events_pending() && (i++<10));
+#else
+    ::wxYield();
+#endif
+}
Index: Trunk/XaraLX/wxXtra/platform.h
===================================================================
--- Trunk/XaraLX/wxXtra/platform.h	(revision 1343)
+++ Trunk/XaraLX/wxXtra/platform.h	(revision 1344)
@@ -41,6 +41,8 @@
     virtual void SetGtkWidgetName(wxWindow * pwxWindow, char * name);
 #endif
 
+    virtual void RealYield();
+
 	DECLARE_DYNAMIC_CLASS(wxPlatformDependent);
 };
 
Index: Trunk/XaraLX/wxOil/colpick.cpp
===================================================================
--- Trunk/XaraLX/wxOil/colpick.cpp	(revision 1343)
+++ Trunk/XaraLX/wxOil/colpick.cpp	(revision 1344)
@@ -2945,7 +2945,7 @@
 	if (!flag)
 	{
 		flag++;
-		::wxYield();
+		wxPlatformDependent::Get()->RealYield();
 		flag--;
 	}
 
@@ -2965,7 +2965,7 @@
 	if (!flag)
 	{
 		flag++;
-		::wxYield();
+		wxPlatformDependent::Get()->RealYield();
 		flag--;
 	}
 


Xara