[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1717
Date       : Thu Aug 24 17:18:02 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camelot.cpp
   M /Trunk/XaraLX/wxOil/camframe.cpp

Largely fix the issue with cursors on menus, cursor is still wrong when you use excape to close menu with cursor in drawing area. This sorts itself out when you move cursor (hopefully you'll agree this is a much lesser bug)


Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1716)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1717)
@@ -134,7 +134,6 @@
 #include "prdlgctl.h"
 #include "prncamvw.h"
 #include "gbrush.h"
-#include "csrstack.h"
 #include "selmedia.h"
 #include "filedlgs.h"
 
Index: Trunk/XaraLX/wxOil/camframe.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camframe.cpp	(revision 1716)
+++ Trunk/XaraLX/wxOil/camframe.cpp	(revision 1717)
@@ -115,6 +115,7 @@
 //#include "docview.h" - in camtypes.h [AUTOMATICALLY REMOVED]
 #include "speedtst.h"
 #include "oilmenus.h"
+#include "csrstack.h"
 
 #include "blobby.h"
 #include "dbugtree.h"
@@ -858,6 +859,8 @@
 	Document::GetSelected()->SetCurrent();
 	DocView::GetSelected()->SetCurrent();
 
+	wxSetCursor( *wxSTANDARD_CURSOR );
+
 PORTNOTE( "other", "Removed usage of bSysMent from OnInitMenuPopup" )
 #if !defined(EXCLUDE_FROM_XARALX)
 	if (bSysMenu)
@@ -877,6 +880,7 @@
 		event.Skip();
 }
 
+
 void CCamFrame::OnUpdateStandardBar( wxUpdateUIEvent& event)
 {
 	// We can't find by Runtime Class as there are multiple OpDescriptors with the same Class


Xara