[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1536
Date       : Tue Jul 25 18:10:01 BST 2006

Changed paths:
   M /Trunk/XaraLX/configure.in
   M /Trunk/XaraLX/wxOil/menupref.cpp
   M /Trunk/XaraLX/wxOil/staticversion.h

Remove Debug menu and changed version to 0.7


Diff:
Index: Trunk/XaraLX/configure.in
===================================================================
--- Trunk/XaraLX/configure.in	(revision 1535)
+++ Trunk/XaraLX/configure.in	(revision 1536)
@@ -1,6 +1,6 @@
 AC_INIT(wxOil/camelot.cpp)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(XaraLX, 0.6)
+AM_INIT_AUTOMAKE(XaraLX, 0.7)
 
 # BinReloc sets CFLAGS and CXXFLAGS, so we have to undo this
 inCFLAGS=$CFLAGS
Index: Trunk/XaraLX/wxOil/staticversion.h
===================================================================
--- Trunk/XaraLX/wxOil/staticversion.h	(revision 1535)
+++ Trunk/XaraLX/wxOil/staticversion.h	(revision 1536)
@@ -95,10 +95,10 @@
 
 =================================XARAHEADEREND============================
  */
-const TCHAR g_pszAppVersion[] = wxT("0.6");
+const TCHAR g_pszAppVersion[] = wxT("0.7");
 
 #define	CAMELOT_VERSION_MAJOR	0
-#define	CAMELOT_VERSION_MINOR	6
-#define	CAMELOT_VERSION			0.6
-#define	CAMELOT_VERSION_STRING	wxT("0.6 (root)")
+#define	CAMELOT_VERSION_MINOR	7
+#define	CAMELOT_VERSION			0.7
+#define	CAMELOT_VERSION_STRING	wxT("0.7 (root)")
 #define	MASTER_BUILDER	0
Index: Trunk/XaraLX/wxOil/menupref.cpp
===================================================================
--- Trunk/XaraLX/wxOil/menupref.cpp	(revision 1535)
+++ Trunk/XaraLX/wxOil/menupref.cpp	(revision 1536)
@@ -222,7 +222,20 @@
 				ERRORIF((!GetToken(&MenuScript, OpToken, TokenSize)), 
 						_R(IDE_SYNTAX_ERROR), 
 						NULL);
-                
+
+				TRACEUSER( "luke", _T("SUBMENU \"%s\" \"%s\"
"), OpToken, OPTOKEN_DEBUG_MENU );
+
+#if !defined(ADD_DEBUG_MENU)
+				// Remove DEBUG menu
+				if( 0 == camStrcmp( OpToken, OPTOKEN_DEBUG_MENU ) )
+				{
+					TRACEUSER( "luke", _T(">-SUBMENU %s
"), OPTOKEN_DEBUG_MENU );
+					MenuStack.AddHead(pCurMenu);	//Push Current Menu onto stack
+					pCurMenu = NULL;
+					continue;
+				}
+#endif
+
 				pSubMenu = CreateMenuItem(	OpToken, 
 											pCurMenu->GetMenuId(),
 											GetSeparator(	&MenuScript, 
@@ -251,7 +264,13 @@
 				ERRORIF((!GetToken(&MenuScript, OpToken, TokenSize)), 
 						_R(IDE_SYNTAX_ERROR), 
 						NULL);
-			
+
+#if !defined(ADD_DEBUG_MENU)
+				// Don't add menu itemns if parent not wanted
+				if( NULL == pCurMenu )
+					continue;
+#endif
+
 				pMenuItem = CreateMenuItem(	OpToken,
 											pCurMenu->GetMenuId(),
 											GetSeparator(	&MenuScript, 


Xara