anyedit-cvs — Cvs commit info will come in this list

[Anyedit-cvs] AnyEditv2/includes BCGToolbarCustomize.h, NONE, 1.1 BCGToolbarCustomizePages.h, NONE, 1.1 mxml.h, NONE, 1.1 CBCGToolbarCustomize.h, 1.2, NONE CBCGToolbarCustomizePages.h, 1.2, NONE

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2/includes
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28593

Added Files:
	BCGToolbarCustomize.h BCGToolbarCustomizePages.h mxml.h 
Removed Files:
	CBCGToolbarCustomize.h CBCGToolbarCustomizePages.h 
Log Message:
Update of the BCG includes.

--- NEW FILE: mxml.h ---
/*
 * "$Id: mxml.h,v 1.1 2006/11/13 08:48:10 moonshyne Exp $"
 *
 * Header file for Mini-XML, a small XML-like file parsing library.
 *
 * Copyright 2003-2005 by Michael Sweet.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
 * License as published by the Free Software Foundation; either
 * version 2, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

/*
 * Prevent multiple inclusion...
 */

#ifndef _mxml_h_
#  define _mxml_h_

/*
 * Include necessary headers...
 */

#  include <stdio.h>
#  include <stdlib.h>
#  include <string.h>
#  include <ctype.h>
#  include <errno.h>


/*
 * Constants...
 */

#  define MXML_WRAP		72	/* Wrap XML output at this column position */
#  define MXML_TAB		8	/* Tabs every N columns */

#  define MXML_NO_CALLBACK	0	/* Don't use a type callback */
#  define MXML_INTEGER_CALLBACK	mxml_integer_cb
					/* Treat all data as integers */
#  define MXML_OPAQUE_CALLBACK	mxml_opaque_cb
					/* Treat all data as opaque */
#  define MXML_REAL_CALLBACK	mxml_real_cb
					/* Treat all data as real numbers */
#  define MXML_TEXT_CALLBACK	0	/* Treat all data as text */

#  define MXML_NO_PARENT	0	/* No parent for the node */

#  define MXML_DESCEND		1	/* Descend when finding/walking */
#  define MXML_NO_DESCEND	0	/* Don't descend when finding/walking */
#  define MXML_DESCEND_FIRST	-1	/* Descend for first find */

#  define MXML_WS_BEFORE_OPEN	0	/* Callback for before open tag */
#  define MXML_WS_AFTER_OPEN	1	/* Callback for after open tag */
#  define MXML_WS_BEFORE_CLOSE	2	/* Callback for before close tag */
#  define MXML_WS_AFTER_CLOSE	3	/* Callback for after close tag */

#  define MXML_ADD_BEFORE	0	/* Add node before specified node */
#  define MXML_ADD_AFTER	1	/* Add node after specified node */
#  define MXML_ADD_TO_PARENT	NULL	/* Add node relative to parent */


/*
 * Data types...
 */

typedef enum mxml_type_e		/**** The XML node type. ****/
{
  MXML_ELEMENT,				/* XML element with attributes */
  MXML_INTEGER,				/* Integer value */
  MXML_OPAQUE,				/* Opaque string */
  MXML_REAL,				/* Real value */
  MXML_TEXT,				/* Text fragment */
  MXML_CUSTOM				/* Custom data */
} mxml_type_t;

typedef struct mxml_attr_s		/**** An XML element attribute value. ****/
{
  char			*name;		/* Attribute name */
  char			*value;		/* Attribute value */
} mxml_attr_t;

typedef struct mxml_value_s		/**** An XML element value. ****/
{
  char			*name;		/* Name of element */
  int			num_attrs;	/* Number of attributes */
  mxml_attr_t		*attrs;		/* Attributes */
} mxml_element_t;

typedef struct mxml_text_s		/**** An XML text value. ****/
{
  int			whitespace;	/* Leading whitespace? */
  char			*string;	/* Fragment string */
} mxml_text_t;

typedef struct mxml_custom_s		/**** An XML custom value. ****/
{
  void			*data;		/* Pointer to (allocated) custom data */
  void			(*destroy)(void *);
					/* Pointer to destructor function */
} mxml_custom_t;

typedef union mxml_value_u		/**** An XML node value. ****/
{
  mxml_element_t	element;	/* Element */
  int			integer;	/* Integer number */
  char			*opaque;	/* Opaque string */
  double		real;		/* Real number */
  mxml_text_t		text;		/* Text fragment */
  mxml_custom_t		custom;		/* Custom data */
} mxml_value_t;

typedef struct mxml_node_s		/**** An XML node. ****/
{
  mxml_type_t		type;		/* Node type */
  struct mxml_node_s	*next;		/* Next node under same parent */
  struct mxml_node_s	*prev;		/* Previous node under same parent */
  struct mxml_node_s	*parent;	/* Parent node */
  struct mxml_node_s	*child;		/* First child node */
  struct mxml_node_s	*last_child;	/* Last child node */
  mxml_value_t		value;		/* Node value */
} mxml_node_t;

typedef struct mxml_index_s		/**** An XML node index. ****/
{
  char			*attr;		/* Attribute used for indexing or NULL */
  int			num_nodes;	/* Number of nodes in index */
  int			alloc_nodes;	/* Allocated nodes in index */
  int			cur_node;	/* Current node */
  mxml_node_t		**nodes;	/* Node array */
} mxml_index_t;

typedef int (*mxml_custom_load_cb_t)(mxml_node_t *, const char *);
					/**** Custom data load callback function ****/

typedef char *(*mxml_custom_save_cb_t)(mxml_node_t *);  
					/**** Custom data save callback function ****/


/*
 * C++ support...
 */

#  ifdef __cplusplus
extern "C" {
#  endif /* __cplusplus */

/*
 * Prototypes...
 */

extern void		mxmlAdd(mxml_node_t *parent, int where,
			        mxml_node_t *child, mxml_node_t *node);
extern void		mxmlDelete(mxml_node_t *node);
extern const char	*mxmlElementGetAttr(mxml_node_t *node, const char *name);
extern void		mxmlElementSetAttr(mxml_node_t *node, const char *name,
			                   const char *value);
extern int		mxmlEntityAddCallback(int (*cb)(const char *name));
extern const char	*mxmlEntityGetName(int val);
extern int		mxmlEntityGetValue(const char *name);
extern void		mxmlEntityRemoveCallback(int (*cb)(const char *name));
extern mxml_node_t	*mxmlFindElement(mxml_node_t *node, mxml_node_t *top,
			                 const char *name, const char *attr,
					 const char *value, int descend);
extern void		mxmlIndexDelete(mxml_index_t *ind);
extern mxml_node_t	*mxmlIndexEnum(mxml_index_t *ind);
extern mxml_node_t	*mxmlIndexFind(mxml_index_t *ind,
			               const char *element,
			               const char *value);
extern mxml_index_t	*mxmlIndexNew(mxml_node_t *node, const char *element,
			              const char *attr);
extern mxml_node_t	*mxmlIndexReset(mxml_index_t *ind);
extern mxml_node_t	*mxmlLoadFd(mxml_node_t *top, int fd,
			            mxml_type_t (*cb)(mxml_node_t *));
extern mxml_node_t	*mxmlLoadFile(mxml_node_t *top, FILE *fp,
			              mxml_type_t (*cb)(mxml_node_t *));
extern mxml_node_t	*mxmlLoadString(mxml_node_t *top, const char *s,
			                mxml_type_t (*cb)(mxml_node_t *));
extern mxml_node_t	*mxmlNewCustom(mxml_node_t *parent, void *data,
			               void (*destroy)(void *));
extern mxml_node_t	*mxmlNewElement(mxml_node_t *parent, const char *name);
extern mxml_node_t	*mxmlNewInteger(mxml_node_t *parent, int integer);
extern mxml_node_t	*mxmlNewOpaque(mxml_node_t *parent, const char *opaque);
extern mxml_node_t	*mxmlNewReal(mxml_node_t *parent, double real);
extern mxml_node_t	*mxmlNewText(mxml_node_t *parent, int whitespace,
			             const char *string);
extern mxml_node_t	*mxmlNewTextf(mxml_node_t *parent, int whitespace,
			              const char *format, ...)
#    ifdef __GNUC__
__attribute__ ((__format__ (__printf__, 3, 4)))
#    endif /* __GNUC__ */
;
extern void		mxmlRemove(mxml_node_t *node);
extern char		*mxmlSaveAllocString(mxml_node_t *node,
			        	     const char *(*cb)(mxml_node_t *, int));
extern int		mxmlSaveFd(mxml_node_t *node, int fd,
			           const char *(*cb)(mxml_node_t *, int));
extern int		mxmlSaveFile(mxml_node_t *node, FILE *fp,
			             const char *(*cb)(mxml_node_t *, int));
extern int		mxmlSaveString(mxml_node_t *node, char *buffer,
			               int bufsize,
			               const char *(*cb)(mxml_node_t *, int));
extern int		mxmlSetCustom(mxml_node_t *node, void *data,
			              void (*destroy)(void *));
extern void		mxmlSetCustomHandlers(mxml_custom_load_cb_t load,
			                      mxml_custom_save_cb_t save);
extern int		mxmlSetElement(mxml_node_t *node, const char *name);
extern void		mxmlSetErrorCallback(void (*cb)(const char *));
extern int		mxmlSetInteger(mxml_node_t *node, int integer);
extern int		mxmlSetOpaque(mxml_node_t *node, const char *opaque);
extern int		mxmlSetReal(mxml_node_t *node, double real);
extern int		mxmlSetText(mxml_node_t *node, int whitespace,
			            const char *string);
extern int		mxmlSetTextf(mxml_node_t *node, int whitespace,
			             const char *format, ...)
#    ifdef __GNUC__
__attribute__ ((__format__ (__printf__, 3, 4)))
#    endif /* __GNUC__ */
;
extern mxml_node_t	*mxmlWalkNext(mxml_node_t *node, mxml_node_t *top,
			              int descend);
extern mxml_node_t	*mxmlWalkPrev(mxml_node_t *node, mxml_node_t *top,
			              int descend);


/*
 * Private functions...
 */

extern void		mxml_error(const char *format, ...);
extern mxml_type_t	mxml_integer_cb(mxml_node_t *node);
extern mxml_type_t	mxml_opaque_cb(mxml_node_t *node);
extern mxml_type_t	mxml_real_cb(mxml_node_t *node);


/*
 * C++ support...
 */

#  ifdef __cplusplus
}
#  endif /* __cplusplus */
#endif /* !_mxml_h_ */


/*
 * End of "$Id: mxml.h,v 1.1 2006/11/13 08:48:10 moonshyne Exp $".
 */

--- NEW FILE: BCGToolbarCustomize.h ---
//*******************************************************************************
// COPYRIGHT NOTES
// ---------------
// This source code is a part of BCGControlBar library.
// You may use, compile or redistribute it as part of your application 
// for free. You cannot redistribute it as a part of a software development 
// library without the agreement of the author. If the sources are 
// distributed along with the application, you should leave the original 
// copyright notes in the source code without any changes.
// This code can be used WITHOUT ANY WARRANTIES on your own risk.
// 
// For the latest updates to this library, check my site:
// http://welcome.to/bcgsoft
// 
// Stas Levin <bc...@ya...>
//*******************************************************************************

// CBCGToolbarCustomize.h : header file
//
// CBCGToolbarCustomize is a modeless property sheet that is 
// created once and not destroyed until the application
// closes.  It is initialized and controlled from
// CPropertyFrame.
 
#ifndef __CBCGTOOLBARCUSTOMIZE_H__
#define __CBCGTOOLBARCUSTOMIZE_H__

#ifndef BCG_NO_CUSTOMIZATION

#include "bcgcontrolbar.h"
#include "BCGToolbarCustomizePages.h"
#include "BCGToolsPage.h"
#include "MenuPage.h"
#include "MousePage.h"
#include "KeyboardPage.h"
#include "OptionsPage.h"

class CBCGToolBarImages;
class CBCGToolbarButton;
class CBCGToolBar;
class CBCGUserTool;

//---------------------
// Customization flags:
//---------------------
#define BCGCUSTOMIZE_MENU_SHADOWS		0x0001	// Allow chnage menu shadow appearance
#define BCGCUSTOMIZE_TEXT_LABELS		0x0002	// Allow chnage toolbar text lables below the image
#define BCGCUSTOMIZE_LOOK_2000			0x0004	// Allow chnage look 2000
#define BCGCUSTOMIZE_MENU_ANIMATIONS	0x0008	// Allow chnage menu animations
#define BCGCUSTOMIZE_NOHELP				0x0010	// Remove help button from the customization dialog
#define BCGCUSTOMIZE_CONTEXT_HELP		0x0020	// Add '?' to caption and "What's This" context menu

/////////////////////////////////////////////////////////////////////////////
// CBCGToolbarCustomize

class BCGCONTROLBARDLLEXPORT CBCGToolbarCustomize : public CPropertySheet
{
	friend class CBCGToolBar;
	friend class CBCGToolsPage;
	friend class CToolsList;

	DECLARE_DYNAMIC(CBCGToolbarCustomize)

// Construction
public:
	CBCGToolbarCustomize (CFrameWnd* pWndParentFrame, 
						BOOL bAutoSetFromMenus = FALSE,
						UINT uiFlags = (BCGCUSTOMIZE_MENU_SHADOWS | BCGCUSTOMIZE_TEXT_LABELS | BCGCUSTOMIZE_LOOK_2000 | BCGCUSTOMIZE_MENU_ANIMATIONS),
						CList <CRuntimeClass*, CRuntimeClass*>* plistCustomPages = NULL);
// Attributes
public:
	UINT GetFlags () const
	{
		return m_uiFlags;
	}

protected:
	//------------------------------------------
	// Toolbar+menu items divided by categories:
	//------------------------------------------
	CMap<CString, LPCTSTR, CObList*, CObList*>	m_ButtonsByCategory;
	CStringList									m_strCategoriesList;
													// Need for order!
	//----------------
	// Property pages:
	//----------------	
	CBCGCustomizePage*	m_pCustomizePage;
	CBCGToolbarsPage*	m_pToolbarsPage;
	CBCGKeyboardPage*	m_pKeyboardPage;
	CBCGMenuPage*		m_pMenuPage;
	CBCGMousePage*		m_pMousePage;
	CBCGOptionsPage*	m_pOptionsPage;
	CBCGToolsPage*		m_pToolsPage;
	
	// ET: Support for additional custom pages
	CList<CPropertyPage*,CPropertyPage*>	m_listCustomPages;

	CString				m_strAllCommands;

	CFrameWnd*			m_pParentFrame;
	BOOL				m_bAutoSetFromMenus;
	UINT				m_uiFlags;

// Operations
public:

	void AddButton (UINT uiCategoryId, const CBCGToolbarButton& button,
					int iInsertAfter = -1);
	void AddButton (LPCTSTR lpszCategory, const CBCGToolbarButton& button,
					int iInsertAfter = -1);

	int RemoveButton (UINT uiCategoryId, UINT uiCmdId);
	int RemoveButton (LPCTSTR lpszCategory, UINT uiCmdId);

	void ReplaceButton (UINT uiCmd, const CBCGToolbarButton& button);

	BOOL AddToolBar (UINT uiCategoryId, UINT uiToolbarResId);
	BOOL AddToolBar (LPCTSTR lpszCategory, UINT uiToolbarResId);
	BOOL AddMenu (UINT uiMenuResId);
	void AddMenuCommands (const CMenu* pMenu, BOOL bPopup, LPCTSTR lpszCategory = NULL);

	BOOL RenameCategory(LPCTSTR lpszCategoryOld, LPCTSTR lpszCategoryNew);

	BOOL SetUserCategory (LPCTSTR lpszCategory);

	void EnableUserDefinedToolbars (BOOL bEnable = TRUE);
	void EnableTools (CObList* pToolsList);	// List of CBCGUserTool-derived objects

	void FillCategotiesComboBox (CComboBox& wndCategory, 
        bool bAllowNewMenuCmd = false) const;
	void FillCategotiesListBox (CListBox& wndCategory, 
        bool bAllowNewMenuCmd = false) const;
	
	virtual void FillAllCommandsList (CListBox& wndListOfCommands) const;

	LPCTSTR GetCommandName (UINT uiCmd) const;

protected:
	void SetFrameCustMode (BOOL bCustMode);
	void ShowToolBar (CBCGToolBar* pToolBar, BOOL bShow);
	void SetupFromMenus ();
	void AddUserTools (LPCTSTR lpszCategory);

// Overrides
	// ClassWizard generated virtual function overrides
	//{{AFX_VIRTUAL(CBCGToolbarCustomize)
	public:
	virtual BOOL OnInitDialog();
	protected:
	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
	//}}AFX_VIRTUAL

	//------------------
	// Tools page hooks:
	//------------------
	virtual void OnInitToolsPage () {}
	virtual void OnBeforeChangeTool (CBCGUserTool* /*pSelTool*/) {}
	virtual void OnAfterChangeTool (CBCGUserTool* /*pSelTool*/) {}
	virtual BOOL CheckToolsValidity (const CObList& /*lstTools*/)
	{
		return TRUE;
	}

public:
	virtual BOOL Create();

// Implementation
public:
	 virtual ~CBCGToolbarCustomize();
	 virtual void PostNcDestroy();

// Generated message map functions
protected:
	//{{AFX_MSG(CBCGToolbarCustomize)
	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
	afx_msg BOOL OnHelpInfo(HELPINFO* pHelpInfo);
	afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
	//}}AFX_MSG
	DECLARE_MESSAGE_MAP()
};

/////////////////////////////////////////////////////////////////////////////

#endif // BCG_NO_CUSTOMIZATION
#endif	// __CBCGTOOLBARCUSTOMIZE_H__

--- NEW FILE: BCGToolbarCustomizePages.h ---
//*******************************************************************************
// COPYRIGHT NOTES
// ---------------
// This source code is a part of BCGControlBar library.
// You may use, compile or redistribute it as part of your application 
// for free. You cannot redistribute it as a part of a software development 
// library without the agreement of the author. If the sources are 
// distributed along with the application, you should leave the original 
// copyright notes in the source code without any changes.
// This code can be used WITHOUT ANY WARRANTIES on your own risk.
// 
// For the latest updates to this library, check my site:
// http://welcome.to/bcgsoft
// 
// Stas Levin <bc...@ya...>
//*******************************************************************************

// CBCGToolbarCustomizePages.h : header file
//

#ifndef __CBCGTOOLBARCUSTOMIZEPAGES_H__
#define __CBCGTOOLBARCUSTOMIZEPAGES_H__

#ifndef BCG_NO_CUSTOMIZATION

#include "ButtonsList.h"
#include "ButtonsTextList.h"
#include "bcgbarres.h"

#ifndef __AFXTEMPL_H__
	#include "afxtempl.h"
#endif

#include "BCGExCheckList.h"

/////////////////////////////////////////////////////////////////////////////
// CBCGCustomizePage dialog

class CBCGToolbarButton;
class CBCGToolBarImages;
class CBCGToolBar;

class CBCGCustomizePage : public CPropertyPage
{
	DECLARE_DYNCREATE(CBCGCustomizePage)

// Construction
public:
	CBCGCustomizePage();
	~CBCGCustomizePage();

// Operations:
	void SetUserCategory (LPCTSTR lpszCategory);
	void SetAllCategory (LPCTSTR lpszCategory);
	void OnChangeSelButton (CBCGToolbarButton* pButton);

protected:

// Dialog Data
	//{{AFX_DATA(CBCGCustomizePage)
	enum { IDD = IDD_BCGBARRES_PROPPAGE1 };
	CListBox	m_wndCategory;
	CButtonsTextList	m_wndTools;
	CString	m_strButtonDescription;
	//}}AFX_DATA


// Overrides
	// ClassWizard generate virtual function overrides
	//{{AFX_VIRTUAL(CBCGCustomizePage)
	protected:
	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
	//}}AFX_VIRTUAL

// Implementation
protected:
	// Generated message map functions
	//{{AFX_MSG(CBCGCustomizePage)
	afx_msg void OnSelchangeUserTools();
	virtual BOOL OnInitDialog();
	afx_msg void OnSelchangeCategory();
	//}}AFX_MSG
	DECLARE_MESSAGE_MAP()

// Attributes:
protected:

	CBCGToolbarButton*	m_pSelButton;
	CString				m_strUserCategory;
	CString				m_strAllCategory;
};

/////////////////////////////////////////////////////////////////////////////
// CBCGToolbarsPage dialog

class CBCGToolbarsPage : public CPropertyPage
{
	DECLARE_DYNCREATE(CBCGToolbarsPage)

// Construction
public:
	CBCGToolbarsPage(CFrameWnd* pParentFrame = NULL);
	~CBCGToolbarsPage();

// Dialog Data
	//{{AFX_DATA(CBCGToolbarsPage)
	enum { IDD = IDD_BCGBARRES_PROPPAGE2 };
	CButton	m_wndTextLabels;
	CButton	m_bntRenameToolbar;
	CButton	m_btnNewToolbar;
	CButton	m_btnDelete;
	CButton	m_btnReset;
	CBCGExCheckList	m_wndToobarList;
	BOOL	m_bTextLabels;
	//}}AFX_DATA

// Operations:
public:
	void ShowToolBar (CBCGToolBar* pToolBar, BOOL bShow);
	void EnableUserDefinedToolbars (BOOL bEnable)
	{
		m_bUserDefinedToolbars = bEnable;
	}

protected:
// Overrides
	// ClassWizard generate virtual function overrides
	//{{AFX_VIRTUAL(CBCGToolbarsPage)
	protected:
	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
	//}}AFX_VIRTUAL

// Implementation
protected:
	// Generated message map functions
	//{{AFX_MSG(CBCGToolbarsPage)
	virtual BOOL OnInitDialog();
	afx_msg void OnSelchangeToolbarList();
	afx_msg void OnDblclkToolbarList();
	afx_msg void OnReset();
	afx_msg void OnResetAll();
	afx_msg void OnDeleteToolbar();
	afx_msg void OnNewToolbar();
	afx_msg void OnRenameToolbar();
	afx_msg void OnBcgbarresTextLabels();
	//}}AFX_MSG
	DECLARE_MESSAGE_MAP()

	CBCGToolBar*	m_pSelectedToolbar;
	BOOL			m_bUserDefinedToolbars;
	CFrameWnd*		m_pParentFrame;
};

#endif // BCG_NO_CUSTOMIZATION

#endif // __CBCGTOOLBARCUSTOMIZEPAGES_H__

--- CBCGToolbarCustomize.h DELETED ---

--- CBCGToolbarCustomizePages.h DELETED ---

[Anyedit-cvs] AnyEditBin ANYEDIT.EXE.manifest, 1.1, NONE BCGCB474.DLL.manifest, 1.1, NONE

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditBin
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv15491

Removed Files:
	ANYEDIT.EXE.manifest BCGCB474.DLL.manifest 
Log Message:
Manifest files are obsolute in VS2005. They are embedded as resource.

--- BCGCB474.DLL.manifest DELETED ---

--- ANYEDIT.EXE.manifest DELETED ---

[Anyedit-cvs] AnyEditv2 AnyEdit.sln, NONE, 1.1 AnyEdit.vcproj, NONE, 1.1

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv13329

Added Files:
	AnyEdit.sln AnyEdit.vcproj 
Log Message:
Visual Studion 2005 project files.

--- NEW FILE: AnyEdit.sln ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: AnyEdit.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="AnyEdit"
	ProjectGUID="{974618DB-9371-49CC-A696-7F267159C9D7}"
	RootNamespace="AnyEdit"
	Keyword="MFCProj"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
[...3847 lines suppressed...]
				/>
			</FileConfiguration>
			<FileConfiguration
				Name="Release|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					Optimization="2"
					PreprocessorDefinitions=""
				/>
			</FileConfiguration>
		</File>
		<File
			RelativePath="FolderDlg.h"
			>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Anyedit-cvs] AnyEditv2 HtmlFile.cpp,1.2,1.3

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12427

Modified Files:
	HtmlFile.cpp 
Log Message:
Fixed Buffer Overflow Bug in reading HTML Resource.

Index: HtmlFile.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/HtmlFile.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HtmlFile.cpp	12 Oct 2005 18:55:57 -0000	1.2
--- HtmlFile.cpp	21 Oct 2006 09:19:34 -0000	1.3
***************
*** 233,236 ****
--- 233,238 ----
  	if (hResource != NULL)
  	{
+ 		// Get the size of the resource
+ 		DWORD dwSize = ::SizeofResource(AfxGetResourceHandle(), hResource);
  		// Found it, lock and load!
  		HGLOBAL hGlobal = ::LoadResource(AfxGetResourceHandle(), hResource);
***************
*** 238,242 ****
  		{
  			LPVOID lpData = ::LockResource(hGlobal);
! 			m_sContents = (const char*)lpData;
  			::UnlockResource(hGlobal);
  		}
--- 240,244 ----
  		{
  			LPVOID lpData = ::LockResource(hGlobal);
! 			m_sContents = CString((LPTSTR)lpData, dwSize);
  			::UnlockResource(hGlobal);
  		}

[Anyedit-cvs] AnyEditv2/lib/Release BCGCB474.lib, 1.1, 1.2 ctagslib.lib, 1.1, 1.2 gnu_regex_lib.lib, 1.1, 1.2

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2/lib/Release
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10056/lib/Release

Modified Files:
	BCGCB474.lib ctagslib.lib gnu_regex_lib.lib 
Log Message:
Fixes to build in Visual Studio 2005.

Index: gnu_regex_lib.lib
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/lib/Release/gnu_regex_lib.lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvskEnv2m and /tmp/cvsZL83la differ

Index: BCGCB474.lib
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/lib/Release/BCGCB474.lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsvxQJzp and /tmp/cvsztjF8c differ

Index: ctagslib.lib
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/lib/Release/ctagslib.lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvson4Cjv and /tmp/cvsVaOu9i differ

[Anyedit-cvs] AnyEditv2 AnyEditView.cpp, 1.95, 1.96 ClassTree.cpp, 1.18, 1.19 FileEditCtrl.cpp, 1.3, 1.4 FileEditCtrl.h, 1.4, 1.5 FileTreeCtrl.cpp, 1.9, 1.10 FileTypeManager.cpp, 1.32, 1.33 FindComboBox.h, 1.5, 1.6 FindReplaceManager.cpp, 1.8, 1.9 MDITabs.cpp, 1.15, 1.16 MainFrm.cpp, 1.80, 1.81 MainFrm.h, 1.52, 1.53 NewProject.cpp, 1.12, 1.13 OutputEdit.cpp, 1.11, 1.12 QuickJump.cpp, 1.18, 1.19 RegProfile.h, 1.8, 1.9 SAPrefsDialog.cpp, 1.23, 1.24 ScintillaEx.cpp, 1.33, 1.34 WorkspaceTreeCtrl.cpp, 1.17, 1.18 XFileDialog.cpp, 1.1, 1.2 XFileDialog.h, 1.1, 1.2 XHistoryCombo.cpp, 1.1, 1.2 pugxml.h, 1.6, 1.7

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10056

Modified Files:
	AnyEditView.cpp ClassTree.cpp FileEditCtrl.cpp FileEditCtrl.h 
	FileTreeCtrl.cpp FileTypeManager.cpp FindComboBox.h 
	FindReplaceManager.cpp MDITabs.cpp MainFrm.cpp MainFrm.h 
	NewProject.cpp OutputEdit.cpp QuickJump.cpp RegProfile.h 
	SAPrefsDialog.cpp ScintillaEx.cpp WorkspaceTreeCtrl.cpp 
	XFileDialog.cpp XFileDialog.h XHistoryCombo.cpp pugxml.h 
Log Message:
Fixes to build in Visual Studio 2005.

Index: FileTypeManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** FileTypeManager.cpp	21 Nov 2005 20:26:34 -0000	1.32
--- FileTypeManager.cpp	21 Oct 2006 09:17:16 -0000	1.33
***************
*** 106,110 ****
  			pSyntaxFile->SetFilename( szFileName );
  
! 			fp = fopen( szFileName, "rw" );
  			// Read the syntax definitions from the file.
  			if( !fp )
--- 106,110 ----
  			pSyntaxFile->SetFilename( szFileName );
  
! 			fp = fopen( szFileName, "r" );
  			// Read the syntax definitions from the file.
  			if( !fp )

Index: FileTreeCtrl.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FileTreeCtrl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FileTreeCtrl.cpp	30 Sep 2004 13:09:10 -0000	1.9
--- FileTreeCtrl.cpp	21 Oct 2006 09:17:16 -0000	1.10
***************
*** 880,884 ****
  
      //And the files to the tree control (if required)
!     for (i=0; i<FilePaths.GetSize(); i++)
      {
          CString& sPath = FilePaths.ElementAt(i);
--- 880,884 ----
  
      //And the files to the tree control (if required)
!     for (int i=0; i<FilePaths.GetSize(); i++)
      {
          CString& sPath = FilePaths.ElementAt(i);

Index: FileEditCtrl.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FileEditCtrl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileEditCtrl.h	25 Sep 2004 13:10:08 -0000	1.4
--- FileEditCtrl.h	21 Oct 2006 09:17:16 -0000	1.5
***************
*** 178,182 ****
      afx_msg void OnMouseMove(UINT nFlags, CPoint point);
      afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
!     afx_msg UINT OnNcHitTest(CPoint point);
      afx_msg void OnNcLButtonDblClk(UINT nHitTest, CPoint point);
      afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point);
--- 178,182 ----
      afx_msg void OnMouseMove(UINT nFlags, CPoint point);
      afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
!     afx_msg LRESULT OnNcHitTest(CPoint point);
      afx_msg void OnNcLButtonDblClk(UINT nHitTest, CPoint point);
      afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point);

Index: FileEditCtrl.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FileEditCtrl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileEditCtrl.cpp	25 Sep 2004 13:10:08 -0000	1.3
--- FileEditCtrl.cpp	21 Oct 2006 09:17:16 -0000	1.4
***************
*** 1704,1708 ****
  /////////////////////////////////////////////////////////////////////////////
  
! UINT CFileEditCtrl::OnNcHitTest(CPoint point)
  {
      UINT where = CEdit::OnNcHitTest(point);
--- 1704,1708 ----
  /////////////////////////////////////////////////////////////////////////////
  
! LRESULT CFileEditCtrl::OnNcHitTest(CPoint point)
  {
      UINT where = CEdit::OnNcHitTest(point);

Index: ScintillaEx.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ScintillaEx.cpp	21 Nov 2005 20:26:34 -0000	1.33
--- ScintillaEx.cpp	21 Oct 2006 09:17:16 -0000	1.34
***************
*** 977,981 ****
  						unsigned pos = (oldPos / tabSpacing + 1) * tabSpacing;
  
! 						for (unsigned k = 0; oldPos + k < pos && strLine.GetAt(oldPos + k) == ' '; k++)
  							;
  
--- 977,982 ----
  						unsigned pos = (oldPos / tabSpacing + 1) * tabSpacing;
  
! 						unsigned k;
! 						for (k = 0; oldPos + k < pos && strLine.GetAt(oldPos + k) == ' '; k++)
  							;
  
***************
*** 1775,1781 ****
  	 */
  
! 	for (int i = 0 ; isNumber(s1[i]); i++)
  		;
! 	for (int j = 0 ; isNumber(s2[j]); j++)
  		;
  	if (i > 0 && j > 0)
--- 1776,1784 ----
  	 */
  
! 	int i;
! 	int j;
! 	for (i = 0 ; isNumber(s1[i]); i++)
  		;
! 	for (j = 0 ; isNumber(s2[j]); j++)
  		;
  	if (i > 0 && j > 0)
***************
*** 1827,1833 ****
  	 * are the same the numbers should be detected too. eg. "N123" and "N456"
  	 */
! 	for (int i = 0 ; *s1 && isNumber(s1[i]); i++)
  		;
! 	for (int j = 0 ; *s2 && isNumber(s2[j]); j++)
  		;
  	if (i > 0 && j > 0)
--- 1830,1838 ----
  	 * are the same the numbers should be detected too. eg. "N123" and "N456"
  	 */
! 	int i;
! 	int j;
! 	for (i = 0 ; *s1 && isNumber(s1[i]); i++)
  		;
! 	for (j = 0 ; *s2 && isNumber(s2[j]); j++)
  		;
  	if (i > 0 && j > 0)

Index: MDITabs.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MDITabs.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MDITabs.cpp	28 Aug 2004 07:04:40 -0000	1.15
--- MDITabs.cpp	21 Oct 2006 09:17:16 -0000	1.16
***************
*** 256,260 ****
  	// all remaining views in vChild have to be added as new tabs
  
! 	i = GetItemCount();
  	for (TWndIter it = vChild.begin(), end = vChild.end(); it != end; ++it)
  	{
--- 256,260 ----
  	// all remaining views in vChild have to be added as new tabs
  
! 	int i = GetItemCount();
  	for (TWndIter it = vChild.begin(), end = vChild.end(); it != end; ++it)
  	{
***************
*** 468,472 ****
  	SendMessage(WM_SETFONT, WPARAM(GetStockObject(DEFAULT_GUI_FONT)), 0);
  
! 	for (HWND wnd = ::GetTopWindow(*pMainFrame); wnd; wnd = ::GetNextWindow(wnd, GW_HWNDNEXT))
  	{
  		char wndClass[32];
--- 468,473 ----
  	SendMessage(WM_SETFONT, WPARAM(GetStockObject(DEFAULT_GUI_FONT)), 0);
  
! 	HWND wnd;
! 	for (wnd = ::GetTopWindow(*pMainFrame); wnd; wnd = ::GetNextWindow(wnd, GW_HWNDNEXT))
  	{
  		char wndClass[32];

Index: SAPrefsDialog.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/SAPrefsDialog.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** SAPrefsDialog.cpp	27 Jan 2005 13:50:44 -0000	1.23
--- SAPrefsDialog.cpp	21 Oct 2006 09:17:16 -0000	1.24
***************
*** 595,599 ****
  	{
  		// tell all of the sub-dialogs "OK"
! 		for (i=0;i<m_pages.GetSize();i++)
  		{
  			pageStruct *pPS = (pageStruct *)m_pages.GetAt(i);
--- 595,599 ----
  	{
  		// tell all of the sub-dialogs "OK"
! 		for (int i=0;i<m_pages.GetSize();i++)
  		{
  			pageStruct *pPS = (pageStruct *)m_pages.GetAt(i);

Index: MainFrm.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** MainFrm.cpp	18 Oct 2005 17:39:32 -0000	1.80
--- MainFrm.cpp	21 Oct 2006 09:17:16 -0000	1.81
***************
*** 428,432 ****
      }
  
!     for(i = delCnt; i < 9; i++)
      {
          popUp.DeleteMenu(delCnt, MF_BYPOSITION);
--- 428,432 ----
      }
  
!     for(int i = delCnt; i < 9; i++)
      {
          popUp.DeleteMenu(delCnt, MF_BYPOSITION);
***************
*** 1528,1532 ****
  }
  
! void CMainFrame::OnMenuLanguage(UINT uiId)
  {
  	CDocument* pDocument = theApp.GetCurrentDoc();
--- 1528,1532 ----
  }
  
! BOOL CMainFrame::OnMenuLanguage(UINT uiId)
  {
  	CDocument* pDocument = theApp.GetCurrentDoc();
***************
*** 1535,1538 ****
--- 1535,1539 ----
  		((CAnyEditDoc*)pDocument)->SetLanguageNr( uiId - ID_MENU_LANGUAGE );
  	}
+ 	return FALSE;
  }
  

Index: MainFrm.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** MainFrm.h	12 Oct 2005 18:55:57 -0000	1.52
--- MainFrm.h	21 Oct 2006 09:17:16 -0000	1.53
***************
*** 207,211 ****
  	afx_msg void OnSyncFileView();
  	afx_msg void OnUpdateSyncFileView(CCmdUI* pCmdUI);
! 	afx_msg void OnMenuLanguage(UINT uiId);
  	afx_msg void OnUpdateMenuLanguage(CCmdUI* pCmdUI);
  	//}}AFX_MSG
--- 207,211 ----
  	afx_msg void OnSyncFileView();
  	afx_msg void OnUpdateSyncFileView(CCmdUI* pCmdUI);
! 	afx_msg BOOL OnMenuLanguage(UINT uiId);
  	afx_msg void OnUpdateMenuLanguage(CCmdUI* pCmdUI);
  	//}}AFX_MSG

Index: FindComboBox.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FindComboBox.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FindComboBox.h	12 Oct 2005 18:55:57 -0000	1.5
--- FindComboBox.h	21 Oct 2006 09:17:16 -0000	1.6
***************
*** 32,35 ****
--- 32,36 ----
  //
  #include "FlatComboBox.h"
+ #include "ImageHash.h"
  
  #include "RegProfile.h"

Index: pugxml.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/pugxml.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pugxml.h	25 Sep 2004 13:10:09 -0000	1.6
--- pugxml.h	21 Oct 2006 09:17:16 -0000	1.7
***************
*** 318,321 ****
--- 318,322 ----
  inline static bool strwnorm(TCHAR** s)
  {
+ 	long i;
  	if(!s || !*s) return false; //No string to normalize.
  	while(**s > 0 && **s < _T('!')) ++(*s); //As long as we hit whitespace, increment the string pointer.
***************
*** 328,332 ****
  	long j = 1;
  	norm[0] = (*s)[0];
! 	for(long i=1; i<n; ++i) //For each character, starting at offset 1.
  	{
  		if((*s)[i] < _T('!')) //Whitespace-like.
--- 329,333 ----
  	long j = 1;
  	norm[0] = (*s)[0];
! 	for(i=1; i<n; ++i) //For each character, starting at offset 1.
  	{
  		if((*s)[i] < _T('!')) //Whitespace-like.
***************
*** 1879,1883 ****
  	xml_const_iterator() : _vref(0) {} //Default constructor.
  	xml_const_iterator(const xml_node_struct* vref,long sscr = 0) : xml_iter<_Ty,_Diff,_Pointer,_Reference>(sscr), _vref(vref){ } //Initializing constructor.
! 	xml_const_iterator(const xml_iterator& r) : xml_iter<_Ty,_Diff,_Pointer,_Reference>(r), _vref(r._vref){ } //Copy constructor.
  public:
  	virtual xml_const_iterator& operator=(const xml_const_iterator& rhs){ _vref = rhs._vref; xml_iter<_Ty,_Diff,_Pointer,_Reference>::operator=(rhs); return *this;} //Assignment.
--- 1880,1884 ----
  	xml_const_iterator() : _vref(0) {} //Default constructor.
  	xml_const_iterator(const xml_node_struct* vref,long sscr = 0) : xml_iter<_Ty,_Diff,_Pointer,_Reference>(sscr), _vref(vref){ } //Initializing constructor.
! //	xml_const_iterator(const xml_iterator& r) : xml_iter<_Ty,_Diff,_Pointer,_Reference>(r), _vref(r._vref){ } //Copy constructor.
  public:
  	virtual xml_const_iterator& operator=(const xml_const_iterator& rhs){ _vref = rhs._vref; xml_iter<_Ty,_Diff,_Pointer,_Reference>::operator=(rhs); return *this;} //Assignment.
***************
*** 3603,3606 ****
--- 3604,3608 ----
  	bool remove_child(unsigned int i)
  	{
+ 		unsigned int j;
  		unsigned int n = _root->children;
  		if(i < n) //Ensure subscript is in bounds.
***************
*** 3608,3612 ****
  			xml_node_struct* p = _root->child[i]; //Keep a pointer to this node so we can free it.
  			--n;
! 			for(unsigned int j=i; j<n; ++j) //Shift everything left from this point on.
  				_root->child[j] = _root->child[j+1];
  			_root->child[j] = NULL; //Mark the last element null.
--- 3610,3614 ----
  			xml_node_struct* p = _root->child[i]; //Keep a pointer to this node so we can free it.
  			--n;
! 			for(j=i; j<n; ++j) //Shift everything left from this point on.
  				_root->child[j] = _root->child[j+1];
  			_root->child[j] = NULL; //Mark the last element null.

Index: NewProject.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/NewProject.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NewProject.cpp	12 Oct 2005 18:55:57 -0000	1.12
--- NewProject.cpp	21 Oct 2006 09:17:16 -0000	1.13
***************
*** 201,205 ****
  
  	AEProject* pProject = new AEProject((LPCTSTR)sProjectName, (LPCTSTR)sProjectFile);
! 	for(i=0;i<filArray.GetSize();i++)
  	{
  		pProject->InsertItem(new AEProjectFile((LPCTSTR)filArray[i]));
--- 201,205 ----
  
  	AEProject* pProject = new AEProject((LPCTSTR)sProjectName, (LPCTSTR)sProjectFile);
! 	for(int i=0;i<filArray.GetSize();i++)
  	{
  		pProject->InsertItem(new AEProjectFile((LPCTSTR)filArray[i]));

Index: XHistoryCombo.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/XHistoryCombo.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XHistoryCombo.cpp	20 Sep 2004 18:50:51 -0000	1.1
--- XHistoryCombo.cpp	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 262,266 ****
    }
    // remove redundant items
!   for (n = nMax; n < 1000/* prevent runaway*/; n++)
    {
      CString sKey;
--- 262,266 ----
    }
    // remove redundant items
!   for (int n = nMax; n < 1000/* prevent runaway*/; n++)
    {
      CString sKey;

Index: OutputEdit.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/OutputEdit.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** OutputEdit.cpp	7 Nov 2005 19:37:47 -0000	1.11
--- OutputEdit.cpp	21 Oct 2006 09:17:16 -0000	1.12
***************
*** 453,458 ****
  	// Get the text of the longest line.
  	CString szText;
! 	GetLine( iLine, szText.GetBuffer( LineLength( LineIndex( iLine ) ) ), LineLength( LineIndex( iLine ) ) );
! 	szText.ReleaseBuffer();
  
  	// Get the size of the client window
--- 453,458 ----
  	// Get the text of the longest line.
  	CString szText;
! //	GetLine( iLine, szText.GetBuffer( LineLength( LineIndex( iLine ) ) ), LineLength( LineIndex( iLine ) ) );
! //	szText.ReleaseBuffer();
  
  	// Get the size of the client window

Index: FindReplaceManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FindReplaceManager.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FindReplaceManager.cpp	12 Oct 2005 18:55:57 -0000	1.8
--- FindReplaceManager.cpp	21 Oct 2006 09:17:16 -0000	1.9
***************
*** 246,250 ****
  	// Write replace array
  	tempStr.Empty();
!     for(i = 0; i < m_arReplaceStrings.GetSize(); i++)
      {
          tempStr += m_arReplaceStrings[i] + _T("|");
--- 246,250 ----
  	// Write replace array
  	tempStr.Empty();
!     for(int i = 0; i < m_arReplaceStrings.GetSize(); i++)
      {
          tempStr += m_arReplaceStrings[i] + _T("|");
***************
*** 254,258 ****
  	// Write folders array
  	tempStr.Empty();
!     for(i = 0; i < m_arFolders.GetSize(); i++)
      {
          tempStr += m_arFolders[i] + _T("|");
--- 254,258 ----
  	// Write folders array
  	tempStr.Empty();
!     for(int i = 0; i < m_arFolders.GetSize(); i++)
      {
          tempStr += m_arFolders[i] + _T("|");
***************
*** 262,266 ****
  	// Write file type array
  	tempStr.Empty();
!     for(i = 0; i < m_arFileTypes.GetSize(); i++)
      {
          tempStr += m_arFileTypes[i] + _T("|");
--- 262,266 ----
  	// Write file type array
  	tempStr.Empty();
!     for(int i = 0; i < m_arFileTypes.GetSize(); i++)
      {
          tempStr += m_arFileTypes[i] + _T("|");

Index: ClassTree.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ClassTree.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ClassTree.cpp	12 Oct 2005 18:55:57 -0000	1.18
--- ClassTree.cpp	21 Oct 2006 09:17:16 -0000	1.19
***************
*** 689,695 ****
  	// Now public, protected, private for each of the first four images:
  	pBmp2 = dcMem2.SelectObject(&bmpAccessible);
! 	for (int iAccess = 0; iAccess < IMAGE_ACCESS_COUNT; iAccess++)
  	{
! 		for (int iItem = 0; iItem < IMAGE_ACCESSIBLE_ITEM_COUNT; iItem++)
  		{
  			pBmp = dcMem.SelectObject(&bmpOne);
--- 689,697 ----
  	// Now public, protected, private for each of the first four images:
  	pBmp2 = dcMem2.SelectObject(&bmpAccessible);
! 	int iAccess;
! 	for (iAccess = 0; iAccess < IMAGE_ACCESS_COUNT; iAccess++)
  	{
! 		int iItem;
! 		for (iItem = 0; iItem < IMAGE_ACCESSIBLE_ITEM_COUNT; iItem++)
  		{
  			pBmp = dcMem.SelectObject(&bmpOne);

Index: XFileDialog.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/XFileDialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XFileDialog.h	20 Sep 2004 18:49:38 -0000	1.1
--- XFileDialog.h	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 72,77 ****
  	{
  		XFILEDIALOG_AUTO_DETECT_OS_VERSION = 0,
! 		XFILEDIALOG_OS_VERSION_4,
! 		XFILEDIALOG_OS_VERSION_5
  	};
  	CString GetPath();
--- 72,78 ----
  	{
  		XFILEDIALOG_AUTO_DETECT_OS_VERSION = 0,
! 		XFILEDIALOG_OS_VERSION_4, // Windows NT4
! 		XFILEDIALOG_OS_VERSION_5, // Windows 2000
! 		XFILEDIALOG_OS_VERSION_51 // Windows XP
  	};
  	CString GetPath();

Index: XFileDialog.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/XFileDialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XFileDialog.cpp	20 Sep 2004 18:49:38 -0000	1.1
--- XFileDialog.cpp	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 42,46 ****
  
  // self-initialization message posted
! const MYWM_POSTINIT = WM_USER+1;
  
  static const TCHAR BASED_CODE szFileDialog[]    = _T("FileDialog");
--- 42,46 ----
  
  // self-initialization message posted
! const int MYWM_POSTINIT = WM_USER+1;
  
  static const TCHAR BASED_CODE szFileDialog[]    = _T("FileDialog");
***************
*** 416,450 ****
  BOOL CXFileDialog::IsWin2000()
  {
! 	if (GetOsVersion() == XFILEDIALOG_OS_VERSION_4)
! 		return FALSE;
! 	else if (GetOsVersion() == XFILEDIALOG_OS_VERSION_5)
! 		return TRUE;
  
! 	// Try calling GetVersionEx using the OSVERSIONINFOEX structure,
! 	// which is supported on Windows 2000.
! 	//
! 	// If that fails, try using the OSVERSIONINFO structure.
  
! 	OSVERSIONINFOEX osvi;
! 	ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
! 	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
  
! 	BOOL bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *) &osvi);
! 	if (!bOsVersionInfoEx)
! 	{
! 		// If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO.
  
! 		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
! 		if (!GetVersionEx((OSVERSIONINFO *) &osvi))
! 			return FALSE;
  	}
  
- 	switch (osvi.dwPlatformId)
- 	{
- 		case VER_PLATFORM_WIN32_NT:
- 			if (osvi.dwMajorVersion >= 5)
- 				return TRUE;
- 			break;
- 	}
  	return FALSE;
  }
--- 416,451 ----
  BOOL CXFileDialog::IsWin2000()
  {
! 	if (GetOsVersion() == XFILEDIALOG_AUTO_DETECT_OS_VERSION)
! 	{
! 		// Try calling GetVersionEx using the OSVERSIONINFOEX structure,
! 		// which is supported on Windows 2000.
! 		//
! 		// If that fails, try using the OSVERSIONINFO structure.
  
! 		OSVERSIONINFOEX osvi;
! 		ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
! 		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
  
! 		BOOL bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *) &osvi);
! 		if (!bOsVersionInfoEx)
! 		{
! 			// If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO.
  
! 			osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
! 			if (!GetVersionEx((OSVERSIONINFO *) &osvi))
! 				return FALSE;
! 		}
  
! 		switch (osvi.dwPlatformId)
! 		{
! 			case VER_PLATFORM_WIN32_NT:
! 				if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
! 					return TRUE;
! 				break;
! 		}
  	}
+ 	else if (GetOsVersion() == XFILEDIALOG_OS_VERSION_5)
+ 		return TRUE;
  
  	return FALSE;
  }

Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** AnyEditView.cpp	1 Dec 2005 18:37:26 -0000	1.95
--- AnyEditView.cpp	21 Oct 2006 09:17:16 -0000	1.96
***************
*** 3127,3131 ****
      theApp.GetTagsNearest(root, classviewwords);
  //    finalwords.Append(classviewwords);
!     for(i = 0; i < classviewwords.GetSize(); i++)
      {
  		all_words.SetAt(classviewwords.GetAt(i), classviewwords.GetAt(i));
--- 3127,3131 ----
      theApp.GetTagsNearest(root, classviewwords);
  //    finalwords.Append(classviewwords);
!     for(int i = 0; i < classviewwords.GetSize(); i++)
      {
  		all_words.SetAt(classviewwords.GetAt(i), classviewwords.GetAt(i));

Index: WorkspaceTreeCtrl.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/WorkspaceTreeCtrl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** WorkspaceTreeCtrl.cpp	12 Oct 2005 18:55:57 -0000	1.17
--- WorkspaceTreeCtrl.cpp	21 Oct 2006 09:17:16 -0000	1.18
***************
*** 476,480 ****
  	{
  		CString sMessage = "The following files could not be added to the project, as they already exist:\n";
! 		for(i=0;i<arFailed.GetSize();i++)
  			sMessage += arFailed.GetAt(i) + "\n";
  		AfxMessageBox(sMessage, MB_ICONWARNING|MB_OK);
--- 476,480 ----
  	{
  		CString sMessage = "The following files could not be added to the project, as they already exist:\n";
! 		for(int i=0;i<arFailed.GetSize();i++)
  			sMessage += arFailed.GetAt(i) + "\n";
  		AfxMessageBox(sMessage, MB_ICONWARNING|MB_OK);
***************
*** 1099,1103 ****
  		arr.RemoveAll();
  		msc.GetFoldersInFolder(sFolder, arr);
! 		for (i=0;i<arr.GetSize();i++)
  		{
  			if (AddFolderAndContents(pNewFolder, sFolder + "\\" + arr[i], sMask, bRecursive))
--- 1099,1103 ----
  		arr.RemoveAll();
  		msc.GetFoldersInFolder(sFolder, arr);
! 		for (int i=0;i<arr.GetSize();i++)
  		{
  			if (AddFolderAndContents(pNewFolder, sFolder + "\\" + arr[i], sMask, bRecursive))

Index: QuickJump.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/QuickJump.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** QuickJump.cpp	12 Oct 2005 18:55:57 -0000	1.18
--- QuickJump.cpp	21 Oct 2006 09:17:16 -0000	1.19
***************
*** 172,175 ****
--- 172,176 ----
  
  	// Select current type:
+ 	int i;
  	for (i=0;i<pTypeBox->GetCount();i++)
  	{

Index: RegProfile.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/RegProfile.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RegProfile.h	12 Oct 2005 18:55:57 -0000	1.8
--- RegProfile.h	21 Oct 2006 09:17:16 -0000	1.9
***************
*** 47,52 ****
  // These two values define the starting point for all AnyEdit's Registry
  // settings (HKEY_CURRENT_USER\Software\<COMPANY>\<APPNAME>)
! #define COMPANY _T("DeepSoft")
! #define APPNAME _T("AnyEdit Editor")
  
  // The seperator used in registry keys
--- 47,52 ----
  // These two values define the starting point for all AnyEdit's Registry
  // settings (HKEY_CURRENT_USER\Software\<COMPANY>\<APPNAME>)
! #define COMPANY _T("TeamAnyEdit")
! #define APPNAME _T("AnyEdit")
  
  // The seperator used in registry keys

[Anyedit-cvs] AnyEditv2/lib/Debug BCGCB474D.lib, 1.1, 1.2 ctagslib.lib, 1.2, 1.3 gnu_regex_lib.lib, 1.2, 1.3

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2/lib/Debug
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10056/lib/Debug

Modified Files:
	BCGCB474D.lib ctagslib.lib gnu_regex_lib.lib 
Log Message:
Fixes to build in Visual Studio 2005.

Index: gnu_regex_lib.lib
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/lib/Debug/gnu_regex_lib.lib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsYrtWDP and /tmp/cvsdxrGSt differ

Index: BCGCB474D.lib
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/lib/Debug/BCGCB474D.lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvshYa07S and /tmp/cvs1dD7Ix differ

Index: ctagslib.lib
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/lib/Debug/ctagslib.lib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsyYJeCY and /tmp/cvsIj5GND differ

[Anyedit-cvs] AnyEditv2/includes BCGCB.h, 1.2, 1.3 BCGContextMenuManager.h, 1.1, 1.2 BCGControlBar.h, 1.1, 1.2 BCGDropDown.h, 1.1, 1.2 BCGEditListBox.h, 1.2, 1.3 BCGPopupMenu.h, 1.2, 1.3 BCGRegistry.h, 1.1, 1.2 BCGSizingControlBar.h, 1.2, 1.3 BCGToolBar.h, 1.2, 1.3 BCGToolBarImages.h, 1.1, 1.2 BCGWorkspace.h, 1.1, 1.2

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2/includes
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10056/includes

Modified Files:
	BCGCB.h BCGContextMenuManager.h BCGControlBar.h BCGDropDown.h 
	BCGEditListBox.h BCGPopupMenu.h BCGRegistry.h 
	BCGSizingControlBar.h BCGToolBar.h BCGToolBarImages.h 
	BCGWorkspace.h 
Log Message:
Fixes to build in Visual Studio 2005.

Index: BCGToolBar.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGToolBar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BCGToolBar.h	18 Jul 2004 21:41:35 -0000	1.2
--- BCGToolBar.h	21 Oct 2006 09:17:16 -0000	1.3
***************
*** 56,59 ****
--- 56,61 ----
  BCGCONTROLBARDLLEXPORT extern UINT BCGM_RESETCONTEXTMENU;
  BCGCONTROLBARDLLEXPORT extern UINT BCGM_RESETKEYBOARD;
+ // added by Paolo Messina
+ BCGCONTROLBARDLLEXPORT extern UINT BCGM_SELECTMENUITEM;
  
  static const int dwDefaultToolbarStyle = (WS_CHILD | WS_VISIBLE | CBRS_TOP | 
***************
*** 636,640 ****
  	afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
  	afx_msg void OnNcPaint();
! 	afx_msg UINT OnNcHitTest(CPoint point);
  	afx_msg void OnBcgbarresCopyImage();
  	afx_msg void OnSetFocus(CWnd* pOldWnd);
--- 638,642 ----
  	afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
  	afx_msg void OnNcPaint();
! 	afx_msg LRESULT OnNcHitTest(CPoint point);
  	afx_msg void OnBcgbarresCopyImage();
  	afx_msg void OnSetFocus(CWnd* pOldWnd);

Index: BCGRegistry.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGRegistry.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BCGRegistry.h	22 Sep 2002 08:21:41 -0000	1.1
--- BCGRegistry.h	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 42,45 ****
--- 42,46 ----
  
  #include "bcgcontrolbar.h"
+ #include "mxml.h"
  
  class BCGCONTROLBARDLLEXPORT CBCGRegistry : public CObject
***************
*** 60,64 ****
  // Operations
  public:
! 	BOOL ReadKeyValues(CStringArray& Values);
  	BOOL VerifyKey (LPCTSTR pszPath);
  	BOOL VerifyValue (LPCTSTR pszValue);
--- 61,65 ----
  // Operations
  public:
! 	//BOOL ReadKeyValues(CStringArray& Values);
  	BOOL VerifyKey (LPCTSTR pszPath);
  	BOOL VerifyValue (LPCTSTR pszValue);
***************
*** 71,74 ****
--- 72,76 ----
  
  	BOOL Write (LPCTSTR pszKey, int iVal);
+ 	BOOL Write (LPCTSTR pszKey, long lVal);
  	BOOL Write (LPCTSTR pszKey, DWORD dwVal);
  	BOOL Write (LPCTSTR pszKey, LPCTSTR pszVal);
***************
*** 86,89 ****
--- 88,92 ----
  
  	BOOL Read (LPCTSTR pszKey, int& iVal);
+ 	BOOL Read (LPCTSTR pszKey, long& lVal);
  	BOOL Read (LPCTSTR pszKey, DWORD& dwVal);
  	BOOL Read (LPCTSTR pszKey, CString& sVal);
***************
*** 100,108 ****
  	BOOL Read (LPCTSTR pszKey, CObject*& pObj);
  
! 	BOOL ReadSubKeys(CStringArray& SubKeys);
  
  protected:
  
! 	HKEY		m_hKey;
  	CString		m_sPath;
  	const BOOL	m_bReadOnly;
--- 103,116 ----
  	BOOL Read (LPCTSTR pszKey, CObject*& pObj);
  
! 	//BOOL ReadSubKeys(CStringArray& SubKeys);
  
  protected:
  
! //	HKEY		m_hKey;
! 	int count;
! 	static int refcount;
! //	FILE* logfile;
! 	static mxml_node_t* tree;
! 	static mxml_node_t* key;
  	CString		m_sPath;
  	const BOOL	m_bReadOnly;

Index: BCGSizingControlBar.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGSizingControlBar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BCGSizingControlBar.h	18 Jul 2004 21:41:35 -0000	1.2
--- BCGSizingControlBar.h	21 Oct 2006 09:17:16 -0000	1.3
***************
*** 309,313 ****
      afx_msg void OnNcPaint();
      afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
!     afx_msg UINT OnNcHitTest(CPoint point);
      afx_msg void OnCaptureChanged(CWnd *pWnd);
      afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
--- 309,313 ----
      afx_msg void OnNcPaint();
      afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
!     afx_msg LRESULT OnNcHitTest(CPoint point);
      afx_msg void OnCaptureChanged(CWnd *pWnd);
      afx_msg void OnLButtonUp(UINT nFlags, CPoint point);

Index: BCGCB.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGCB.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BCGCB.h	18 Jul 2004 21:41:35 -0000	1.2
--- BCGCB.h	21 Oct 2006 09:17:16 -0000	1.3
***************
*** 131,135 ****
  // BCG customization stuff:
  //-------------------------
! #include "CBCGToolbarCustomize.h"
  
  #include "BCGContextMenuManager.h"
--- 131,135 ----
  // BCG customization stuff:
  //-------------------------
! #include "BCGToolbarCustomize.h"
  
  #include "BCGContextMenuManager.h"

Index: BCGWorkspace.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGWorkspace.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BCGWorkspace.h	22 Sep 2002 08:21:41 -0000	1.1
--- BCGWorkspace.h	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 24,27 ****
--- 24,29 ----
  
  #include "BCGUserTool.h"
+ #include "BCGMDIFrameWnd.h"
+ 
  
  class CBCGMouseManager;
***************
*** 34,37 ****
--- 36,40 ----
  class CBCGFrameWnd;
  class CBCGOleIPFrameWnd;
+ class CBCGToolBarImages;
  
  class CBCGWorkspace;
***************
*** 81,84 ****
--- 84,94 ----
  								const UINT uiCmdFirst, const UINT uiCmdLast);
  
+     // by Oz Solomonovich - user images that are managed automatically 
+     // (saved/restored from the registry/resrouce file as needed)
+     BOOL    EnableAutoUserImages(UINT idDefaultImagesRes);
+ 
+     CBCGToolBarImages *GetUserImages() { return m_pUserImages; };
+     const CBCGToolBarImages *GetUserImages() const { return m_pUserImages; };
+ 
  	CBCGMouseManager*		GetMouseManager();
  	CBCGContextMenuManager*	GetContextMenuManager();
***************
*** 158,161 ****
--- 168,174 ----
  	virtual BOOL StoreWindowPlacement (
  				const CRect& rectNormalPosition, int nFflags, int nShowCmd);
+ 
+     CBCGToolBarImages *m_pUserImages;
+ 
  protected:
  	CString	m_strRegSection;

Index: BCGPopupMenu.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGPopupMenu.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BCGPopupMenu.h	18 Jul 2004 21:41:35 -0000	1.2
--- BCGPopupMenu.h	21 Oct 2006 09:17:16 -0000	1.3
***************
*** 37,40 ****
--- 37,41 ----
  class BCGCONTROLBARDLLEXPORT CBCGPopupMenu : public CMiniFrameWnd
  {
+     friend class CBCGContextMenuManager;
  	friend class CBCGToolbarMenuButton;
  	friend class CBCGMenuPage;
***************
*** 320,324 ****
  	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
  	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
! 	afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
  	afx_msg void OnTimer(UINT nIDEvent);
  	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
--- 321,325 ----
  	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
  	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
! 	afx_msg void OnActivateApp(BOOL bActive, DWORD hTask);
  	afx_msg void OnTimer(UINT nIDEvent);
  	afx_msg void OnMouseMove(UINT nFlags, CPoint point);

Index: BCGEditListBox.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGEditListBox.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BCGEditListBox.h	18 Jul 2004 21:41:35 -0000	1.2
--- BCGEditListBox.h	21 Oct 2006 09:17:16 -0000	1.3
***************
*** 207,211 ****
  	//{{AFX_MSG(CBCGEditListBox)
  	//}}AFX_MSG
! 	afx_msg void OnKeyDown (LPNMLVKEYDOWN pKeyDown, LRESULT* pResult);
  	afx_msg void OnDblclkList (NMHDR* pNMHDR, LRESULT* pResult);
  	afx_msg void OnGetdispinfo(NMHDR* pNMHDR, LRESULT* pResult);
--- 207,211 ----
  	//{{AFX_MSG(CBCGEditListBox)
  	//}}AFX_MSG
! 	afx_msg void OnKeyDown (NMHDR* pKeyDown, LRESULT* pResult);
  	afx_msg void OnDblclkList (NMHDR* pNMHDR, LRESULT* pResult);
  	afx_msg void OnGetdispinfo(NMHDR* pNMHDR, LRESULT* pResult);

Index: BCGControlBar.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGControlBar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BCGControlBar.h	22 Sep 2002 08:21:41 -0000	1.1
--- BCGControlBar.h	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 29,31 ****
--- 29,34 ----
  BCGCONTROLBARDLLEXPORT void BCGCBCleanUp ();
  
+ // No Legacy Support (L. Wennekers)
+ #define _NO_BCG_LEGACY_
+ 
  #endif // __BCGCONTROLBAR_H

Index: BCGDropDown.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGDropDown.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BCGDropDown.h	22 Sep 2002 08:21:41 -0000	1.1
--- BCGDropDown.h	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 140,144 ****
  	afx_msg void OnDestroy();
  	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
! 	afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
  	//}}AFX_MSG
  
--- 140,144 ----
  	afx_msg void OnDestroy();
  	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
! 	afx_msg void OnActivateApp(BOOL bActive, DWORD hTask);
  	//}}AFX_MSG
  

Index: BCGToolBarImages.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGToolBarImages.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BCGToolBarImages.h	22 Sep 2002 08:21:41 -0000	1.1
--- BCGToolBarImages.h	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 103,107 ****
  	}
  
! 	BOOL Load (UINT uiResID, HINSTANCE hinstRes = NULL, BOOL bAdd = FALSE);
  	BOOL Load (LPCTSTR lpszBmpFileName);
  	BOOL Save (LPCTSTR lpszBmpFileName = NULL);
--- 103,108 ----
  	}
  
! 	BOOL Load (UINT uiResID, HINSTANCE hinstRes = NULL, BOOL bAdd = FALSE, 
!         BOOL bIsUserImages = FALSE, LPCTSTR lpszAltRegKey = NULL);
  	BOOL Load (LPCTSTR lpszBmpFileName);
  	BOOL Save (LPCTSTR lpszBmpFileName = NULL);
***************
*** 162,165 ****
--- 163,167 ----
  	BOOL				m_bUserImagesList;	// is user-defined images list?
  	CString				m_strUDLPath;		// user-defined images path
+ 	CString				m_strUDRegKey;		// user-defined registry key
  	BOOL				m_bModified;		// is image modified?
  	int					m_iCount;			// image counter

Index: BCGContextMenuManager.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/includes/BCGContextMenuManager.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BCGContextMenuManager.h	22 Sep 2002 08:21:41 -0000	1.1
--- BCGContextMenuManager.h	21 Oct 2006 09:17:16 -0000	1.2
***************
*** 58,61 ****
--- 58,69 ----
  	HMENU GetMenuByName (LPCTSTR lpszName, UINT* puiOrigResID = NULL) const;
  
+     // by Oz Solomonovich:
+     // Updates the internal menu structures from the context menu's HMENU.
+     // Access the HMENU using GetMenuByName, then propogate any changes you
+     // make to the HMENU by using this function.
+     void ResyncMenu(UINT uiResID) const;
+ 
+     void RenameMenu(LPCTSTR lpszOldName, LPCTSTR lpszNewName);
+ 
  // Attributes:
  protected:

[Anyedit-cvs]AnyEditv2 AnyEditView.cpp,1.94,1.95

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4506

Modified Files:
	AnyEditView.cpp 
Log Message:
Check for Autocompletion setting added.

Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** AnyEditView.cpp	21 Nov 2005 20:12:40 -0000	1.94
--- AnyEditView.cpp	1 Dec 2005 18:37:26 -0000	1.95
***************
*** 3061,3064 ****
--- 3061,3068 ----
  void CAnyEditView::DoCodelist(bool bOneWord)
  {
+ 	// Don't show if autocompletion is off.
+ 	if(!m_Scintilla.GetAutoCompletion())
+ 		return;
+ 
      m_Scintilla.AutoCSetIgnoreCase(TRUE);
      m_Scintilla.AutoCSetCancelAtStart(FALSE);

[Anyedit-cvs]AnyEditv2 FileTypeManager.cpp,1.31,1.32 ScintillaEx.cpp,1.32,1.33 ScintillaEx.h,1.21,1.22

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30693

Modified Files:
	FileTypeManager.cpp ScintillaEx.cpp ScintillaEx.h 
Log Message:
Added Check for configured Auto Completion setting. Added GetSmartInsert function.

Index: FileTypeManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** FileTypeManager.cpp	1 Nov 2005 19:39:46 -0000	1.31
--- FileTypeManager.cpp	21 Nov 2005 20:26:34 -0000	1.32
***************
*** 483,486 ****
--- 483,487 ----
  	pScintilla->SetApi(pSyntaxFile->GetApi());
  
+ 	pScintilla->SetAutoCompletion(pSyntaxFile->GetAutoCompletion());
  	pScintilla->SetAutocompIgnoreCase(pSyntaxFile->GetAutocompleteIgnoreCase());
  	pScintilla->SetAutocompStartCharacters(pSyntaxFile->GetAutocompleteStartCharacters());

Index: ScintillaEx.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ScintillaEx.cpp	13 Nov 2005 10:53:16 -0000	1.32
--- ScintillaEx.cpp	21 Nov 2005 20:26:34 -0000	1.33
***************
*** 64,67 ****
--- 64,68 ----
  	m_calltipWordCharacters = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
  
+ 	m_bAutoCompletion = false;
  	m_bAutoCompleteIgnoreCase = true;
  	m_autoCompleteStartCharacters = ".";
***************
*** 2656,2661 ****
--- 2657,2675 ----
  }
  
+ bool CScintillaEx::GetAutoCompletion()
+ {
+ 	return m_bAutoCompletion;
+ }
+ 
+ void CScintillaEx::SetAutoCompletion( bool bAutoComplete )
+ {
+ 	m_bAutoCompletion = bAutoComplete;
+ }
+ 
  bool CScintillaEx::StartAutoComplete()
  {
+ 	if( !m_bAutoCompletion )
+ 		return false;
+ 
  	CString line = GetLineText();
  	int current = GetCaretInLine();
***************
*** 2726,2729 ****
--- 2740,2749 ----
  }
  
+ 
+ bool CScintillaEx::GetSmartInsert()
+ {
+ 	return m_bSmartInsert;
+ }
+ 
  void CScintillaEx::SetSmartInsert(bool bSmartInsert)
  {

Index: ScintillaEx.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ScintillaEx.h	1 Nov 2005 19:39:46 -0000	1.21
--- ScintillaEx.h	21 Nov 2005 20:26:34 -0000	1.22
***************
*** 173,176 ****
--- 173,177 ----
  	bool m_bSmartTag;
  	void EliminateDuplicateWords(const char *words);
+ 	bool m_bAutoCompletion;
  	bool m_bAutoCompleteIgnoreCase;
  	bool StartAutoComplete(void);
***************
*** 229,234 ****
--- 230,238 ----
  	bool GetAutocompIgnoreCase(void);
  	void HighlightQuotation(long nPos);
+ 	bool GetSmartInsert();
  	void SetSmartInsert(bool bSmartInsert);
  	bool ExistsApi(void);
+ 	bool GetAutoCompletion();
+ 	void SetAutoCompletion( bool bAutoComplete );
  	void SetAutocompStartCharacters(CString szStartCharacters);
  	void SetAutocompIgnoreCase(bool bIgnoreCase);

[Anyedit-cvs]AnyEditv2 AnyEditView.cpp,1.93,1.94 AnyEditView.h,1.53,1.54

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27566

Modified Files:
	AnyEditView.cpp AnyEditView.h 
Log Message:
Smart Edit (Insert, Tab, Tag) Menu handlers added.

Index: AnyEditView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** AnyEditView.h	17 Oct 2005 17:40:24 -0000	1.53
--- AnyEditView.h	21 Nov 2005 20:12:40 -0000	1.54
***************
*** 325,328 ****
--- 325,334 ----
  	afx_msg void OnEditFormatCenter();
  	afx_msg void OnEditFormatBlock();
+ 	afx_msg void OnEditSmartInsert();
+ 	afx_msg void OnUpdateEditSmartInsert(CCmdUI* pCmdUI);
+ 	afx_msg void OnEditSmartTab();
+ 	afx_msg void OnUpdateEditSmartTab(CCmdUI* pCmdUI);
+ 	afx_msg void OnEditSmartTag();
+ 	afx_msg void OnUpdateEditSmartTag(CCmdUI* pCmdUI);
  	//}}AFX_MSG
      afx_msg void OnEditFind();

Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** AnyEditView.cpp	17 Oct 2005 17:40:24 -0000	1.93
--- AnyEditView.cpp	21 Nov 2005 20:12:40 -0000	1.94
***************
*** 245,248 ****
--- 245,254 ----
  	ON_COMMAND(ID_EDIT_FORMAT_CENTER, OnEditFormatCenter)
  	ON_COMMAND(ID_EDIT_FORMAT_BLOCK, OnEditFormatBlock)
+ 	ON_COMMAND(ID_EDIT_SMART_INSERT, OnEditSmartInsert)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_SMART_INSERT, OnUpdateEditSmartInsert)
+ 	ON_COMMAND(ID_EDIT_SMART_TAB, OnEditSmartTab)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_SMART_TAB, OnUpdateEditSmartTab)
+ 	ON_COMMAND(ID_EDIT_SMART_TAG, OnEditSmartTag)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_SMART_TAG, OnUpdateEditSmartTag)
  	//}}AFX_MSG_MAP
  	// Standard printing commands
***************
*** 3705,3706 ****
--- 3711,3742 ----
  	m_Scintilla.ReplaceTarget(0, _T(""));
  }
+ 
+ void CAnyEditView::OnEditSmartInsert()
+ {
+ 	m_Scintilla.SetSmartInsert(!m_Scintilla.GetSmartInsert());
+ }
+ 
+ void CAnyEditView::OnUpdateEditSmartInsert(CCmdUI* pCmdUI)
+ {
+ 	pCmdUI->SetCheck(m_Scintilla.GetSmartInsert()?1:0);
+ }
+ 
+ void CAnyEditView::OnEditSmartTab()
+ {
+ 	m_Scintilla.SetSmartTab(!m_Scintilla.GetSmartTab());
+ }
+ 
+ void CAnyEditView::OnUpdateEditSmartTab(CCmdUI* pCmdUI)
+ {
+ 	pCmdUI->SetCheck(m_Scintilla.GetSmartTab()?1:0);
+ }
+ 
+ void CAnyEditView::OnEditSmartTag()
+ {
+ 	m_Scintilla.SetSmartTag(!m_Scintilla.GetSmartTag());
+ }
+ 
+ void CAnyEditView::OnUpdateEditSmartTag(CCmdUI* pCmdUI)
+ {
+ 	pCmdUI->SetCheck(m_Scintilla.GetSmartTag()?1:0);
+ }
\ No newline at end of file

[Anyedit-cvs]AnyEditv2 AnyEdit.rc,1.122,1.123 resource.h,1.77,1.78

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26420

Modified Files:
	AnyEdit.rc resource.h 
Log Message:
Added Smart Edit Menus and some small resource tweaks.

Index: resource.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** resource.h	1 Nov 2005 19:41:58 -0000	1.77
--- resource.h	21 Nov 2005 20:07:29 -0000	1.78
***************
*** 707,710 ****
--- 707,713 ----
  #define ID_EDIT_FORMAT_CENTER           33058
  #define ID_EDIT_FORMAT_BLOCK            33059
+ #define ID_EDIT_SMART_INSERT            33061
+ #define ID_EDIT_SMART_TAB               33062
+ #define ID_EDIT_SMART_TAG               33063
  #define ID_EDIT_LAST                    59999
  #define ID_MENU_LANGUAGE                60000
***************
*** 716,720 ****
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        114
! #define _APS_NEXT_COMMAND_VALUE         33060
  #define _APS_NEXT_CONTROL_VALUE         1271
  #define _APS_NEXT_SYMED_VALUE           1341
--- 719,723 ----
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        114
! #define _APS_NEXT_COMMAND_VALUE         33064
  #define _APS_NEXT_CONTROL_VALUE         1271
  #define _APS_NEXT_SYMED_VALUE           1341

Index: AnyEdit.rc
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** AnyEdit.rc	1 Nov 2005 19:41:57 -0000	1.122
--- AnyEdit.rc	21 Nov 2005 20:07:29 -0000	1.123
***************
*** 196,200 ****
          MENUITEM "Save A&ll",                   ID_FILE_SAVEALL
          MENUITEM "&Move file...",               ID_FILE_MOVE
!         MENUITEM "Read &Only",                  ID_FILE_READONLY
          MENUITEM SEPARATOR
          MENUITEM "Open &Workspace",             ID_FILE_OPENWORKSPACE
--- 196,200 ----
          MENUITEM "Save A&ll",                   ID_FILE_SAVEALL
          MENUITEM "&Move file...",               ID_FILE_MOVE
!         MENUITEM "Read Onl&y",                  ID_FILE_READONLY
          MENUITEM SEPARATOR
          MENUITEM "Open &Workspace",             ID_FILE_OPENWORKSPACE
***************
*** 235,239 ****
          MENUITEM "&Block Comment",              ID_EDIT_COMMENTS
          MENUITEM "Co&mment Selection",          ID_EDIT_STREAMCOMMENT
!         MENUITEM "UnComment Select&ion",        ID_EDIT_STREAMUNCOMMENT
          POPUP "De&lete"
          BEGIN
--- 235,239 ----
          MENUITEM "&Block Comment",              ID_EDIT_COMMENTS
          MENUITEM "Co&mment Selection",          ID_EDIT_STREAMCOMMENT
!         MENUITEM "UnComment Selectio&n",        ID_EDIT_STREAMUNCOMMENT
          POPUP "De&lete"
          BEGIN
***************
*** 263,267 ****
              MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECTALL
          END
!         POPUP "Insert"
          BEGIN
              MENUITEM "Insert Filename...",          ID_EDIT_INSERT_FILENAME
--- 263,267 ----
              MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECTALL
          END
!         POPUP "&Insert"
          BEGIN
              MENUITEM "Insert Filename...",          ID_EDIT_INSERT_FILENAME
***************
*** 348,351 ****
--- 348,357 ----
  
          END
+         POPUP "&Smart"
+         BEGIN
+             MENUITEM "Smart &Insert",               ID_EDIT_SMART_INSERT
+             MENUITEM "Smart &Tab",                  ID_EDIT_SMART_TAB
+             MENUITEM "Smart Ta&g",                  ID_EDIT_SMART_TAG
+         END
          MENUITEM SEPARATOR
          MENUITEM "Pre&ferences",                ID_CONFIGURE_PREFERENCES
***************
*** 460,465 ****
          MENUITEM "Auto Co&mplete",              ID_EDIT_CODECOMPLETE
          MENUITEM "Auto Complete &List\tC+S+Space", ID_EDIT_CODECOMPLETELIST
          MENUITEM "&Auto Complete Editor",       ID_CONFIGURE_AUTOCOMPLETEEDITOR
! 
          MENUITEM "Show Calltip",                ID_TOOLS_CALLTIP
          MENUITEM SEPARATOR
--- 466,472 ----
          MENUITEM "Auto Co&mplete",              ID_EDIT_CODECOMPLETE
          MENUITEM "Auto Complete &List\tC+S+Space", ID_EDIT_CODECOMPLETELIST
+         , INACTIVE
          MENUITEM "&Auto Complete Editor",       ID_CONFIGURE_AUTOCOMPLETEEDITOR
!         , INACTIVE
          MENUITEM "Show Calltip",                ID_TOOLS_CALLTIP
          MENUITEM SEPARATOR
***************
*** 3150,3154 ****
      ID_INDICATOR_LINECOL    "Line Column Values"
      ID_INDICATOR_RECORD     "REC"
!     ID_INDICATOR_READ       "READ"
      ID_VIEW_CUSTOMIZE       "Customize toolbars and menus\nCustomize"
      ID_VIEW_USER_TOOLBAR1   "Show or hide the user toolbar\nToggle User ToolBar"
--- 3157,3161 ----
      ID_INDICATOR_LINECOL    "Line Column Values"
      ID_INDICATOR_RECORD     "REC"
!     ID_INDICATOR_READ       "RO"
      ID_VIEW_CUSTOMIZE       "Customize toolbars and menus\nCustomize"
      ID_VIEW_USER_TOOLBAR1   "Show or hide the user toolbar\nToggle User ToolBar"

[Anyedit-cvs]AnyEditv2 AnyEditDoc.cpp,1.56,1.57 AnyEditDoc.h,1.30,1.31

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18604

Modified Files:
	AnyEditDoc.cpp AnyEditDoc.h 
Log Message:
Separated Read Only and Documents change checking from outside of AnyEdit. They are now checked individually.

Index: AnyEditDoc.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** AnyEditDoc.h	1 Nov 2005 19:30:41 -0000	1.30
--- AnyEditDoc.h	13 Nov 2005 10:56:47 -0000	1.31
***************
*** 56,59 ****
--- 56,60 ----
  	CTime	m_tLastChangeTime;		// Time of last change of open document (not file!)
  	CTime	m_tLastParseTime;		// Time of last parsing of open document
+ 	bool	m_bCheckReadOnly;		// Boolean indicating if we should check if the read only flag of the file changed.
  
  	int		m_docPointer;			// Doc Pointer of scintilla controls

Index: AnyEditDoc.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** AnyEditDoc.cpp	1 Nov 2005 19:30:41 -0000	1.56
--- AnyEditDoc.cpp	13 Nov 2005 10:56:47 -0000	1.57
***************
*** 138,141 ****
--- 138,142 ----
  	m_tLastChangeTime = 0;
  	m_tLastParseTime = 0;
+ 	m_bCheckReadOnly = true;
  	m_docPointer = NULL;
  	RemoveTempCopy(TRUE);
***************
*** 403,407 ****
  
  	// First check if we need to check the last access time.
!     if (!theApp.CheckModification() || (m_tLastAccessTime == 0))
  		return;
  
--- 404,408 ----
  
  	// First check if we need to check the last access time.
!     if (!theApp.CheckModification())
  		return;
  
***************
*** 417,454 ****
  		CAnyEditView* pFirstView = GetFirstEditView();
  
!         if(status.m_mtime == m_tLastAccessTime)
  		{
! 			// The file has not changed, check read only flag
! 			if ((status.m_attribute & CFile::Attribute::readOnly) != pFirstView->GetScintillaControl()->GetReadOnly())
  			{
! 				if (status.m_attribute & CFile::Attribute::readOnly)
  				{
! 					if (! pFirstView->GetScintillaControl()->GetReadOnly())
! 					{
! 						if (AfxMessageBox(StrPrintf("File '%s' is now read only. Do you want to set document read only too?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
! 						{
! 							pFirstView->GetScintillaControl()->SetReadOnly(true);
! 						}
! 						else
! 				            m_tLastAccessTime = 0;	// Don't check anymore...
! 					}
  				}
  				else
! 					pFirstView->GetScintillaControl()->SetReadOnly(false);
  			}
! 			m_bLockCheckLastAccessTime = false;
! 			return;
  		}
  
!         m_tLastAccessTime = status.m_mtime;
!         if (AfxMessageBox(StrPrintf("'%s'\nFile has been modified outside AnyEdit!\nDo you want to reload it ?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
  		{
! 			ReloadFile();
  		}
-         else
-         {
-             pFirstView->GetScintillaControl()->SetFocus();
-             m_tLastAccessTime = 0;	// Don't check anymore...
-         }
  	}
  	else
--- 418,457 ----
  		CAnyEditView* pFirstView = GetFirstEditView();
  
! 		// Check read only flag
! 		if (status.m_attribute & CFile::Attribute::readOnly)
  		{
! 			if (m_bCheckReadOnly && !pFirstView->GetScintillaControl()->GetReadOnly())
  			{
! 				if (AfxMessageBox(StrPrintf("File '%s' is now read only. Do you want to set document read only too?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
  				{
! 					pFirstView->GetScintillaControl()->SetReadOnly(true);
  				}
  				else
! 				    m_bCheckReadOnly = false;	// Don't check anymore...
  			}
! 		}
! 		else
! 		{
! 			if( pFirstView->GetScintillaControl()->GetReadOnly() )
! 			{
! 				pFirstView->GetScintillaControl()->SetReadOnly(false);
! 			}
! 			m_bCheckReadOnly = true; // Now we can start checking again.
  		}
  
! 		// Check file modifications
! 		if( m_tLastAccessTime != 0 && status.m_mtime != m_tLastAccessTime )
  		{
!         	m_tLastAccessTime = status.m_mtime;
!         	if (AfxMessageBox(StrPrintf("'%s'\nFile has been modified outside AnyEdit!\nDo you want to reload it ?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
! 			{
! 				ReloadFile();
! 			}
!         	else
!         	{
!         	    pFirstView->GetScintillaControl()->SetFocus();
!         	    m_tLastAccessTime = 0;	// Don't check anymore...
!         	}
  		}
  	}
  	else

[Anyedit-cvs]AnyEditv2 ScintillaEx.cpp,1.31,1.32

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18159

Modified Files:
	ScintillaEx.cpp 
Log Message:
Improved AutoIndent to work with the Smart Tag feature.

Index: ScintillaEx.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ScintillaEx.cpp	7 Nov 2005 19:36:15 -0000	1.31
--- ScintillaEx.cpp	13 Nov 2005 10:53:16 -0000	1.32
***************
*** 1171,1179 ****
  		if( GetEOLMode() == SC_EOL_CRLF )
  			--pos;
  		// Do we have a '{', ')', ':' or '>'
  		if( GetCharAt( pos ) == '{' ||
  			GetCharAt( pos ) == ')' ||
  			GetCharAt( pos ) == ':' ||
! 			( GetCharAt( pos - 1 ) != '/' && GetCharAt( pos ) == '>' ) )
  		{
  			int count = 1;
--- 1171,1190 ----
  		if( GetEOLMode() == SC_EOL_CRLF )
  			--pos;
+ 		// If we have a tag we want to know where it starts.
+ 		long tagStartPos = 0;
+ 		if( GetCharAt( pos ) == '>' )
+ 		{
+ 			tagStartPos = pos - 1;
+ 			while( tagStartPos >= 0 )
+ 			{
+ 				if( '<' == GetCharAt( tagStartPos ) ) break;
+ 				-- tagStartPos;
+ 			}
+ 		}
  		// Do we have a '{', ')', ':' or '>'
  		if( GetCharAt( pos ) == '{' ||
  			GetCharAt( pos ) == ')' ||
  			GetCharAt( pos ) == ':' ||
! 			( GetCharAt( tagStartPos + 1 ) != '/' && GetCharAt( pos - 1 ) != '/' && GetCharAt( pos - 1 ) != '?' && GetCharAt( pos ) == '>' ) )
  		{
  			int count = 1;
***************
*** 1279,1282 ****
--- 1290,1294 ----
  					SetSel(lPos,lCurrentPos);
  					CString text = GetSelText();
+ 					if( text == "<>" ) break;
  					int pos = text.Find(' ');
  					if( -1 == pos )

[Anyedit-cvs]AnyEditv2 memdc.h,NONE,1.1

[boca4711 <boc...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18532

Added Files:
	memdc.h 
Log Message:
class for flicker free drawing

--- NEW FILE: memdc.h ---
#ifndef _MEMDC_H_
#define _MEMDC_H_

//////////////////////////////////////////////////
// CMemDC - memory DC
//
// Author: Keith Rule
// Email:  ke...@eu...
// Copyright 1996-2002, Keith Rule
//
// You may freely use or modify this code provided this
// Copyright is included in all derived versions.
//
// History - 10/3/97 Fixed scrolling bug.
//                   Added print support. - KR
//
//           11/3/99 Fixed most common complaint. Added
//                   background color fill. - KR
//
//           11/3/99 Added support for mapping modes other than
//                   MM_TEXT as suggested by Lee Sang Hun. - KR
//
//           02/11/02 Added support for CScrollView as supplied
//                    by Gary Kirkham. - KR
//
// This class implements a memory Device Context which allows
// flicker free drawing.

class CMemDC : public CDC {
private:	
	CBitmap		m_bitmap;		// Offscreen bitmap
	CBitmap*	m_oldBitmap;	// bitmap originally found in CMemDC
	CDC*		m_pDC;			// Saves CDC passed in constructor
	CRect		m_rect;			// Rectangle of drawing area.
	BOOL		m_bMemDC;		// TRUE if CDC really is a Memory DC.
public:
	
	CMemDC(CDC* pDC, const CRect* pRect = NULL) : CDC()
	{
		ASSERT(pDC != NULL); 

		// Some initialization
		m_pDC = pDC;
		m_oldBitmap = NULL;
		m_bMemDC = !pDC->IsPrinting();

		// Get the rectangle to draw
		if (pRect == NULL) {
			pDC->GetClipBox(&m_rect);
		} else {
			m_rect = *pRect;
		}

		if (m_bMemDC) {
			// Create a Memory DC
			CreateCompatibleDC(pDC);
			pDC->LPtoDP(&m_rect);

			m_bitmap.CreateCompatibleBitmap(pDC, m_rect.Width(), m_rect.Height());
			m_oldBitmap = SelectObject(&m_bitmap);

			SetMapMode(pDC->GetMapMode());

			SetWindowExt(pDC->GetWindowExt());
			SetViewportExt(pDC->GetViewportExt());

			pDC->DPtoLP(&m_rect);
			SetWindowOrg(m_rect.left, m_rect.top);
		} else {
			// Make a copy of the relevent parts of the current DC for printing
			m_bPrinting = pDC->m_bPrinting;
			m_hDC       = pDC->m_hDC;
			m_hAttribDC = pDC->m_hAttribDC;
		}

		// Fill background 
		FillSolidRect(m_rect, pDC->GetBkColor());
	}
	
	~CMemDC()	
	{		
		if (m_bMemDC) {
			// Copy the offscreen bitmap onto the screen.
			m_pDC->BitBlt(m_rect.left, m_rect.top, m_rect.Width(), m_rect.Height(),
				this, m_rect.left, m_rect.top, SRCCOPY);			
			
			//Swap back the original bitmap.
			SelectObject(m_oldBitmap);		
		} else {
			// All we need to do is replace the DC with an illegal value,
			// this keeps us from accidently deleting the handles associated with
			// the CDC that was passed to the constructor.			
			m_hDC = m_hAttribDC = NULL;
		}	
	}
	
	// Allow usage as a pointer	
	CMemDC* operator->() 
	{
		return this;
	}	

	// Allow usage as a pointer	
	operator CMemDC*() 
	{
		return this;
	}
};

#endif

[Anyedit-cvs]AnyEditv2 OutputEdit.cpp,1.10,1.11 OutputEdit.h,1.7,1.8

[boca4711 <boc...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18199

Modified Files:
	OutputEdit.cpp OutputEdit.h 
Log Message:
- bug fixed: output was stopped after some lines
- added flicker free drawing of output

Index: OutputEdit.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/OutputEdit.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OutputEdit.cpp	17 Oct 2005 17:18:59 -0000	1.10
--- OutputEdit.cpp	7 Nov 2005 19:37:47 -0000	1.11
***************
*** 29,32 ****
--- 29,33 ----
  #include "anyedit.h"
  #include "OutputEdit.h"
+ #include "MemDC.h"
  
  #ifdef _DEBUG
***************
*** 68,90 ****
  	CString szCurrentText;
  	
- 	// Construct the new line with EOL
- 	szCurrentText = lpszNewStr;
- 	szCurrentText += "\r\n";
- 	
- 	// This trick prevents the jump to the first
- 	// line in when Setting the Window Text. We
- 	// paste the text from the Clipboard at the
- 	// end of the Edit box.
- 	CopyStrToClipboard(szCurrentText);
- 	Paste();
- 	// TODO: Is there a way to save the clipboard content?
- 	EmptyClipboard();
- 
- 	// Set the new text of the Edit box.
  	GetWindowText(szCurrentText);
  
! 	// Scroll the Editbox, so the last line is visible.
! 	int length = szCurrentText.GetLength();
! 	SetSel(length,length);
  }
  
--- 69,83 ----
  	CString szCurrentText;
  	
  	GetWindowText(szCurrentText);
  
! 	if( !szCurrentText.IsEmpty() ) 
! 		szCurrentText += _T("\r\n");
! 	szCurrentText += lpszNewStr;
! 	SetRedraw(FALSE);
! 	SetWindowText(szCurrentText);
! 	// Scroll the edit control
! 	LineScroll (GetLineCount(), 0);
! 	SetRedraw(TRUE);
! 	UpdateWindow();
  }
  
***************
*** 189,194 ****
  	ON_CONTROL_REFLECT(EN_CHANGE, OnChange)
  	ON_COMMAND(ID_EDIT_COPY, OnEditCopy)
- 	ON_WM_TIMER()
  	ON_WM_CHAR()
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
--- 182,188 ----
  	ON_CONTROL_REFLECT(EN_CHANGE, OnChange)
  	ON_COMMAND(ID_EDIT_COPY, OnEditCopy)
  	ON_WM_CHAR()
+ 	ON_WM_TIMER()
+ 	ON_WM_ERASEBKGND()
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
***************
*** 200,205 ****
  {
  	//CPaintDC dc(this); // device context for painting
! 	Default();
  
  	SetAutoScrollBars();
  
--- 194,209 ----
  {
  	//CPaintDC dc(this); // device context for painting
!     CPaintDC dc(this);
  
+ 	CRect rect;
+ 	GetClientRect(&rect);
+ 
+     // Paint to a memory device context to reduce screen flicker.
+     CMemDC memDC(&dc, &rect);
+ /*
+ 	CRect clip;
+ 	memDC.GetClipBox(&clip);
+ 	memDC.FillSolidRect(clip, GetSysColor(COLOR_WINDOW));
+ */
  	SetAutoScrollBars();
  
***************
*** 207,210 ****
--- 211,217 ----
  		DrawLine(TRUE);
  	// Do not call CEdit::OnPaint() for painting messages
+ 
+     CWnd::DefWindowProc( WM_PAINT, (WPARAM)memDC.m_hDC, 0 );
+ //	Default();
  }
  
***************
*** 480,481 ****
--- 487,493 ----
  	CEdit::OnChar(nChar, nRepCnt, nFlags);
  }
+ 
+ BOOL COutputEdit::OnEraseBkgnd(CDC* pDC) 
+ {
+ 	return FALSE;
+ }

Index: OutputEdit.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/OutputEdit.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OutputEdit.h	12 Oct 2005 18:55:57 -0000	1.7
--- OutputEdit.h	7 Nov 2005 19:37:47 -0000	1.8
***************
*** 75,78 ****
--- 75,79 ----
  	afx_msg void OnEditCopy();
  	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
+ 	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
  	//}}AFX_MSG
  protected:

[Anyedit-cvs]AnyEditv2 ScintillaEx.cpp,1.30,1.31

[boca4711 <boc...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17792

Modified Files:
	ScintillaEx.cpp 
Log Message:
Bug fixed: bookmarks didn't worked after last change

Index: ScintillaEx.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ScintillaEx.cpp	1 Nov 2005 19:39:46 -0000	1.30
--- ScintillaEx.cpp	7 Nov 2005 19:36:15 -0000	1.31
***************
*** 479,488 ****
  	{
  		MarkerDelete( lLine, SC_BOOKMARK );
! 		m_iBookmarkCount --;
! 		// Check if all the handles are still valid.
!     }
  	else
  	{
! 		m_iBookmarkCount ++;
  	}
  }
--- 479,486 ----
  	{
  		MarkerDelete( lLine, SC_BOOKMARK );
! 	}
  	else
  	{
! 		MarkerAdd( lLine, SC_BOOKMARK );
  	}
  }
***************
*** 491,495 ****
  {
  	m_iBookmarkCount ++;
! 	return (int)SPerform(SCI_MARKERADD, (long)line, (long)markerNumber);
  }
  
--- 489,493 ----
  {
  	m_iBookmarkCount ++;
! 	return CScintilla::MarkerAdd(line, markerNumber);
  }
  
***************
*** 497,507 ****
  {
  	m_iBookmarkCount --;
! 	SPerform(SCI_MARKERDELETE, (long)line, (long)markerNumber);
! 	}
  
  void CScintillaEx::MarkerDeleteAll(int markerNumber)
  {
  	m_iBookmarkCount = 0;
! 	SPerform(SCI_MARKERDELETEALL, (long)markerNumber, 0);
  }
  
--- 495,506 ----
  {
  	m_iBookmarkCount --;
! 	CScintilla::MarkerDelete(line, markerNumber);
! }
  
  void CScintillaEx::MarkerDeleteAll(int markerNumber)
  {
  	m_iBookmarkCount = 0;
! 	CScintilla::MarkerDeleteAll(markerNumber);
! //	SPerform(SCI_MARKERDELETEALL, (long)markerNumber, 0);
  }
  

[Anyedit-cvs]AnyEditv2 AnyEdit.rc,1.121,1.122 GeneralPref.cpp,1.14,1.15 GeneralPref.h,1.13,1.14 resource.h,1.76,1.77

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10402

Modified Files:
	AnyEdit.rc GeneralPref.cpp GeneralPref.h resource.h 
Log Message:
Add Smart Insert, Tab and Tag settings to the General Preferences Dialog.

Index: GeneralPref.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/GeneralPref.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GeneralPref.h	12 Oct 2005 18:55:57 -0000	1.13
--- GeneralPref.h	1 Nov 2005 19:41:57 -0000	1.14
***************
*** 61,64 ****
--- 61,67 ----
  	BOOL	m_bSyncFileTab;
  	BOOL	m_bSelectCopy;
+ 	BOOL    m_bSmartInsert;
+ 	BOOL    m_bSmartTab;
+ 	BOOL    m_bSmartTag;
  	//}}AFX_DATA
  

Index: resource.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** resource.h	16 Oct 2005 12:30:05 -0000	1.76
--- resource.h	1 Nov 2005 19:41:58 -0000	1.77
***************
*** 385,388 ****
--- 385,391 ----
  #define IDC_EDIT_FILENAME               1267
  #define IDC_TOUCH                       1268
+ #define IDC_CHECK_SMARTINSERT           1269
+ #define IDC_CHECK_SMARTTAB              1270
+ #define IDC_CHECK_SMARTTAG              1271
  #define ID_AE_REFRESH_STARTUPPAGE       1340
  #define IDD_EDIT_FILE_PROPPAGE1         8410
***************
*** 714,718 ****
  #define _APS_NEXT_RESOURCE_VALUE        114
  #define _APS_NEXT_COMMAND_VALUE         33060
! #define _APS_NEXT_CONTROL_VALUE         1269
  #define _APS_NEXT_SYMED_VALUE           1341
  #endif
--- 717,721 ----
  #define _APS_NEXT_RESOURCE_VALUE        114
  #define _APS_NEXT_COMMAND_VALUE         33060
! #define _APS_NEXT_CONTROL_VALUE         1271
  #define _APS_NEXT_SYMED_VALUE           1341
  #endif

Index: GeneralPref.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/GeneralPref.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GeneralPref.cpp	3 Dec 2004 06:46:12 -0000	1.14
--- GeneralPref.cpp	1 Nov 2005 19:41:57 -0000	1.15
***************
*** 58,61 ****
--- 58,64 ----
  	m_bSyncFileTab = FALSE;
  	m_bSelectCopy = FALSE;
+ 	m_bSmartInsert = FALSE;
+ 	m_bSmartTab = FALSE;
+ 	m_bSmartTag = FALSE;
  	//}}AFX_DATA_INIT
  
***************
*** 80,83 ****
--- 83,89 ----
  	DDX_Check(pDX, IDC_CHECK_SYNCFILETAB, m_bSyncFileTab);
  	DDX_Check(pDX, IDC_CHECK_SELCOPY, m_bSelectCopy);
+ 	DDX_Check(pDX, IDC_CHECK_SMARTINSERT, m_bSmartInsert);
+ 	DDX_Check(pDX, IDC_CHECK_SMARTTAB, m_bSmartTab);
+ 	DDX_Check(pDX, IDC_CHECK_SMARTTAG, m_bSmartTag);
  	//}}AFX_DATA_MAP
  }
***************
*** 101,104 ****
--- 107,113 ----
  	ON_BN_CLICKED(IDC_CHECK_SYNCFILETAB, OnControlChanged)
  	ON_BN_CLICKED(IDC_CHECK_SELCOPY, OnControlChanged)
+ 	ON_BN_CLICKED(IDC_CHECK_SMARTINSERT, OnControlChanged)
+ 	ON_BN_CLICKED(IDC_CHECK_SMARTTAB, OnControlChanged)
+ 	ON_BN_CLICKED(IDC_CHECK_SMARTTAG, OnControlChanged)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
***************
*** 129,132 ****
--- 138,144 ----
  	m_iTabbedDocSelector = pConfigFile->GetTabbedDocumentSelector();
  	m_bSyncFileTab = pConfigFile->GetSynchronizedFileTab();
+ 	m_bSmartInsert = pConfigFile->GetSmartInsert();
+ 	m_bSmartTab = pConfigFile->GetSmartTab();
+ 	m_bSmartTag = pConfigFile->GetSmartTag();
  
  	// Update the dialog
***************
*** 213,216 ****
--- 225,243 ----
  	}
  
+ 	if( m_bSmartInsert != ( pConfigFile->GetSmartInsert() ? TRUE : FALSE ) )
+ 	{
+ 		pConfigFile->SetSmartInsert( m_bSmartInsert ? true : false );
+ 	}
+ 
+ 	if( m_bSmartTab != ( pConfigFile->GetSmartTab() ? TRUE : FALSE ) )
+ 	{
+ 		pConfigFile->SetSmartTab( m_bSmartTab ? true : false );
+ 	}
+ 
+ 	if( m_bSmartTag != ( pConfigFile->GetSmartTag() ? TRUE : FALSE ) )
+ 	{
+ 		pConfigFile->SetSmartTag( m_bSmartTag ? true : false );
+ 	}
+ 
  	return TRUE;
  }

Index: AnyEdit.rc
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** AnyEdit.rc	16 Oct 2005 12:30:05 -0000	1.121
--- AnyEdit.rc	1 Nov 2005 19:41:57 -0000	1.122
***************
*** 14,18 ****
  
  /////////////////////////////////////////////////////////////////////////////
! // Englisch (USA) resources
  
  #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
--- 14,18 ----
  
  /////////////////////////////////////////////////////////////////////////////
! // English (U.S.) resources
  
  #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
***************
*** 1507,1511 ****
      CONTROL         "Allow Multiple Instances",IDC_CHECK_MULTIPLEINSTANCES,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,16,91,10
!     GROUPBOX        "Tabbed Document Selector",IDC_STATIC,162,73,117,46
      CONTROL         "Open Last Workspace",IDC_CHECK_OPENLASTWS,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,12,71,87,10
--- 1507,1511 ----
      CONTROL         "Allow Multiple Instances",IDC_CHECK_MULTIPLEINSTANCES,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,16,91,10
!     GROUPBOX        "Tabbed Document Selector",IDC_STATIC,7,123,146,46
      CONTROL         "Open Last Workspace",IDC_CHECK_OPENLASTWS,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,12,71,87,10
***************
*** 1519,1527 ****
                      BS_AUTOCHECKBOX | WS_TABSTOP,12,16,62,10
      CONTROL         "None",IDC_RADIO_DOCTABNONE,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP,168,104,33,10
      CONTROL         "Bottom",IDC_RADIO_DOCTAB_BOTTOM,"Button",
!                     BS_AUTORADIOBUTTON,168,94,38,10
      CONTROL         "Top",IDC_RADIO_DOCTAB_TOP,"Button",BS_AUTORADIOBUTTON,
!                     168,84,29,10
      CONTROL         "Maximize Documents",IDC_CHECK_MAXIMIZEDOCUMENTS,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,12,38,83,10
--- 1519,1527 ----
                      BS_AUTOCHECKBOX | WS_TABSTOP,12,16,62,10
      CONTROL         "None",IDC_RADIO_DOCTABNONE,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP,13,154,33,10
      CONTROL         "Bottom",IDC_RADIO_DOCTAB_BOTTOM,"Button",
!                     BS_AUTORADIOBUTTON,13,144,38,10
      CONTROL         "Top",IDC_RADIO_DOCTAB_TOP,"Button",BS_AUTORADIOBUTTON,
!                     13,134,29,10
      CONTROL         "Maximize Documents",IDC_CHECK_MAXIMIZEDOCUMENTS,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,12,38,83,10
***************
*** 1529,1537 ****
      GROUPBOX        "On Exit",IDC_STATIC,7,89,146,28
      GROUPBOX        "Editor",IDC_STATIC,162,6,117,52
!     GROUPBOX        "Workspace Bar",IDC_STATIC,162,124,117,27
      CONTROL         "Synchronized File Tab",IDC_CHECK_SYNCFILETAB,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,167,135,86,10
      CONTROL         "Copy On Mouse Selection",IDC_CHECK_SELCOPY,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,167,46,106,10
  END
  
--- 1529,1544 ----
      GROUPBOX        "On Exit",IDC_STATIC,7,89,146,28
      GROUPBOX        "Editor",IDC_STATIC,162,6,117,52
!     GROUPBOX        "Workspace Bar",IDC_STATIC,162,65,117,27
      CONTROL         "Synchronized File Tab",IDC_CHECK_SYNCFILETAB,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,167,76,86,10
      CONTROL         "Copy On Mouse Selection",IDC_CHECK_SELCOPY,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,167,46,106,10
+     GROUPBOX        "Smart Editing",IDC_STATIC,162,98,117,45
+     CONTROL         "Smart Insert",IDC_CHECK_SMARTINSERT,"Button",
+                     BS_AUTOCHECKBOX | WS_TABSTOP,167,108,53,10
+     CONTROL         "Smart Tab",IDC_CHECK_SMARTTAB,"Button",BS_AUTOCHECKBOX | 
+                     WS_TABSTOP,167,119,49,10
+     CONTROL         "Smart Tag",IDC_CHECK_SMARTTAG,"Button",BS_AUTOCHECKBOX | 
+                     WS_TABSTOP,167,129,49,10
  END
  
***************
*** 3318,3322 ****
  END
  
! #endif    // Englisch (USA) resources
  /////////////////////////////////////////////////////////////////////////////
  
--- 3325,3329 ----
  END
  
! #endif    // English (U.S.) resources
  /////////////////////////////////////////////////////////////////////////////
  

[Anyedit-cvs]AnyEditv2 ConfigFile.cpp,1.25,1.26 ConfigFile.h,1.24,1.25 FileTypeManager.cpp,1.30,1.31 ScintillaEx.cpp,1.29,1.30 ScintillaEx.h,1.20,1.21

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9754

Modified Files:
	ConfigFile.cpp ConfigFile.h FileTypeManager.cpp 
	ScintillaEx.cpp ScintillaEx.h 
Log Message:
Added Smart Tag feature. This feature automatically adds a closing tag for html/xml tags. It also takes in account the indentation of the tags.

Index: FileTypeManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** FileTypeManager.cpp	16 Oct 2005 12:13:31 -0000	1.30
--- FileTypeManager.cpp	1 Nov 2005 19:39:46 -0000	1.31
***************
*** 488,491 ****
--- 488,492 ----
  	pScintilla->SetSmartInsert(pConfigFile->GetSmartInsert());
  	pScintilla->SetSmartTab(pConfigFile->GetSmartTab());
+ 	pScintilla->SetSmartTag(pConfigFile->GetSmartTag());
  
  	// Ok now restyle the document.

Index: ScintillaEx.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ScintillaEx.cpp	18 Oct 2005 17:46:31 -0000	1.29
--- ScintillaEx.cpp	1 Nov 2005 19:39:46 -0000	1.30
***************
*** 69,72 ****
--- 69,73 ----
  	m_bSmartInsert = false;
  	m_bSmartTab = false;
+ 	m_bSmartTag = false;
  }
  
***************
*** 300,303 ****
--- 301,308 ----
  				}
  			}
+ 			if( m_bSmartTag && scn->ch == '>' )
+ 			{
+ 				SmartTag();
+ 			}
  			CharacterRange crange = GetSelection();
  			int selStart = crange.cpMin;
***************
*** 1167,1173 ****
  		if( GetEOLMode() == SC_EOL_CRLF )
  			--pos;
! 		// Do we have a '{', ')' or ':'
! 		if( GetCharAt( pos ) == '{' || GetCharAt( pos ) == ')' || GetCharAt( pos ) == ':' )
  		{
  			// Add an extra indent to the current line.
  			if(GetIndent() == 0)
--- 1172,1192 ----
  		if( GetEOLMode() == SC_EOL_CRLF )
  			--pos;
! 		// Do we have a '{', ')', ':' or '>'
! 		if( GetCharAt( pos ) == '{' ||
! 			GetCharAt( pos ) == ')' ||
! 			GetCharAt( pos ) == ':' ||
! 			( GetCharAt( pos - 1 ) != '/' && GetCharAt( pos ) == '>' ) )
  		{
+ 			int count = 1;
+ 			while( ( GetCharAt( pos + count ) == '\r' ||
+ 				     GetCharAt( pos + count ) == '\n' ) &&
+ 				     count <= 2 ) ++ count;
+ 			// Add an extra EOL if we have a cl
+ 			if( GetCharAt( pos + count ) == '}' ||
+ 				( GetCharAt( pos + count ) == '<' && GetCharAt( pos + count + 1 ) == '/' ) )
+ 			{
+ 				InsertEOL(pos + count);
+ 				SetLineIndentationEx(GetCurLineNumber()+1, iIndentation);
+ 			}
  			// Add an extra indent to the current line.
  			if(GetIndent() == 0)
***************
*** 1241,1244 ****
--- 1260,1310 ----
  }
  
+ // Automatically insert closing tag for html/xml tags.
+ void CScintillaEx::SmartTag()
+ {
+ 	long lCurrentPos = GetCurrentPos();
+ 
+ 	// If it was an empty tag we don't have a closing tag.
+ 	if( '/' != GetCharAt( lCurrentPos - 2 ) )
+ 	{
+ 		long lPos = lCurrentPos - 1;
+ 		while( lPos >= 0 )
+ 		{
+ 			if( '<' == GetCharAt( lPos ) )
+ 			{
+ 				// If this is a closing tag or xml declaration skip this action.
+ 				if( '/' == GetCharAt( lPos + 1 ) || '?' == GetCharAt( lPos + 1 ) ) break;
+ 				
+ 				if( lCurrentPos - lPos < 1024 )
+ 				{
+ 					SetSel(lPos,lCurrentPos);
+ 					CString text = GetSelText();
+ 					int pos = text.Find(' ');
+ 					if( -1 == pos )
+ 					{
+ 						text.Insert(1,'/');
+ 					}
+ 					else
+ 					{
+ 						text = text.Left(pos);
+ 						text.Insert(1,'/');
+ 						text += ">";
+ 					}
+ 					BeginUndoAction();
+ 					SetSel(lCurrentPos,lCurrentPos);
+ 					AddText(text.GetLength(), text);
+ 					SetSel(lCurrentPos,lCurrentPos);
+ 					EndUndoAction();
+ 					break;
+ 				}
+ 			}
+ 			else
+ 			{
+ 				-- lPos;
+ 			}
+ 		}
+ 	}
+ }
+ 
  /// Convert begin and end of target to a selection.
  void CScintillaEx::SelectionFromTarget()
***************
*** 2832,2833 ****
--- 2898,2908 ----
  }
  
+ bool CScintillaEx::GetSmartTag()
+ {
+ 	return m_bSmartTag;
+ }
+ 
+ void CScintillaEx::SetSmartTag( bool bSmartTag )
+ {
+ 	m_bSmartTag = bSmartTag;
+ }

Index: ScintillaEx.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ScintillaEx.h	17 Oct 2005 17:36:45 -0000	1.20
--- ScintillaEx.h	1 Nov 2005 19:39:46 -0000	1.21
***************
*** 171,174 ****
--- 171,175 ----
  	bool m_bSmartTab;
  	bool m_bSmartInsert;
+ 	bool m_bSmartTag;
  	void EliminateDuplicateWords(const char *words);
  	bool m_bAutoCompleteIgnoreCase;
***************
*** 214,217 ****
--- 215,221 ----
  	/// Bookmark reference counter
  	int m_iBookmarkCount;
+ 
+ 	/// Insert the end tag for html/xml tags.
+ 	void SmartTag();
  public:
  	CString SelectionURL(int pos);
***************
*** 258,261 ****
--- 262,268 ----
  	void EnsureFinalNewLine();
  	CString SelectionFilename(void);
+ 
+ 	bool GetSmartTag();
+ 	void SetSmartTag( bool bSmartTag );
  };
  

Index: ConfigFile.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ConfigFile.h	16 Oct 2005 12:04:32 -0000	1.24
--- ConfigFile.h	1 Nov 2005 19:39:46 -0000	1.25
***************
*** 90,93 ****
--- 90,94 ----
  #define TAG_EDITOR_SMARTINSERT			"SmartInsert"
  #define TAG_EDITOR_SMARTTAB				"SmartTab"
+ #define TAG_EDITOR_SMARTTAG				"SmartTag"
  
  // Editor attributes
***************
*** 514,517 ****
--- 515,524 ----
  	/// Set smart insert of ([{"'
  	bool SetSmartInsert(bool bSmartInsert);
+ 
+ 	/// Get smart tag inserting end tags
+ 	bool GetSmartTag();
+ 
+ 	/// Set smart tag inserting end tags
+ 	bool SetSmartTag( bool bSmartTag );
  };
  

Index: ConfigFile.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ConfigFile.cpp	16 Oct 2005 12:04:32 -0000	1.25
--- ConfigFile.cpp	1 Nov 2005 19:39:46 -0000	1.26
***************
*** 1209,1210 ****
--- 1209,1222 ----
  	return SetBoolToXMLFile( TAG_EDITOR, TAG_EDITOR_SMARTTAB, bSmartTab );
  }
+ 
+ // Get smart tag inserting end tags
+ bool CConfigFile::GetSmartTag()
+ {
+ 	return GetBoolFromXMLFile( TAG_EDITOR, TAG_EDITOR_SMARTTAG );
+ }
+ 
+ // Set smart tag inserting end tags
+ bool CConfigFile::SetSmartTag( bool bSmartTag )
+ {
+ 	return SetBoolToXMLFile( TAG_EDITOR, TAG_EDITOR_SMARTTAG, bSmartTag );
+ }

[Anyedit-cvs]AnyEditv2 OutputBar.cpp,1.26,1.27

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8677

Modified Files:
	OutputBar.cpp 
Log Message:
Updated last access time check after tool is finished to work faster.

Index: OutputBar.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/OutputBar.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** OutputBar.cpp	31 Jan 2005 22:55:43 -0000	1.26
--- OutputBar.cpp	1 Nov 2005 19:34:54 -0000	1.27
***************
*** 320,331 ****
  
  	// Check the access settings of the active document. A tool could change it.
! 	if( NULL != theApp.GetMainFrameWnd() )
  	{
- 		CDocument* pDocument = theApp.GetMainFrameWnd()->GetActiveDocument();
- 		if( NULL == pDocument || !pDocument->IsKindOf( RUNTIME_CLASS( CAnyEditDoc ) ) ) return 0;
  		((CAnyEditDoc*)pDocument)->CheckLastAccessTime();
  	}
  
- 
  	return 0;
  }
--- 320,329 ----
  
  	// Check the access settings of the active document. A tool could change it.
! 	CDocument* pDocument = theApp.GetCurrentDoc();
! 	if( NULL != pDocument && pDocument->IsKindOf( RUNTIME_CLASS( CAnyEditDoc ) ) )
  	{
  		((CAnyEditDoc*)pDocument)->CheckLastAccessTime();
  	}
  
  	return 0;
  }

[Anyedit-cvs]AnyEditv2 AnyEditDoc.cpp,1.55,1.56 AnyEditDoc.h,1.29,1.30

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7880

Modified Files:
	AnyEditDoc.cpp AnyEditDoc.h 
Log Message:
Fixed read-only switching and updating of UI for read-only.

Index: AnyEditDoc.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** AnyEditDoc.h	16 Oct 2005 11:58:41 -0000	1.29
--- AnyEditDoc.h	1 Nov 2005 19:30:41 -0000	1.30
***************
*** 110,114 ****
  	void SetLastChangePosition(long nPos, long nOffset);
  	long GetLastChangePosition(long nPos);
- 	bool IsFileReadOnly(void);
  	void ReloadFile(void);
  	CAnyEditView*	GetFirstEditView() const;
--- 110,113 ----
***************
*** 125,129 ****
  	long m_arLastPositions[3];			// the three last textpositions
  	bool m_bLockCheckLastAccessTime;
- 	bool m_bFileReadOnly;
  	virtual BOOL DoSave(LPCTSTR lpszPathName, BOOL bReplace = TRUE);
  
--- 124,127 ----

Index: AnyEditDoc.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** AnyEditDoc.cpp	18 Oct 2005 17:42:27 -0000	1.55
--- AnyEditDoc.cpp	1 Nov 2005 19:30:41 -0000	1.56
***************
*** 93,97 ****
  	m_pProjectFile = NULL;
  	m_bOwnProjectFile = FALSE;
- 	m_bFileReadOnly = false;
  	m_bLockCheckLastAccessTime = false;
  	m_bSelectCopy = false;
--- 93,96 ----
***************
*** 295,300 ****
  	SetPathName(lpszPathName);
  	DWORD dwFileAttributes = ::GetFileAttributes(lpszPathName);
! 	m_bFileReadOnly = (dwFileAttributes & FILE_ATTRIBUTE_READONLY) != 0;
! 	pFirstView->GetScintillaControl()->SetReadOnly(m_bFileReadOnly);
  
  	SetLastAccessTime();
--- 294,298 ----
  	SetPathName(lpszPathName);
  	DWORD dwFileAttributes = ::GetFileAttributes(lpszPathName);
! 	pFirstView->GetScintillaControl()->SetReadOnly((dwFileAttributes & FILE_ATTRIBUTE_READONLY) != 0);
  
  	SetLastAccessTime();
***************
*** 341,346 ****
  	SetPathName(lpszPathName);
  	DWORD dwFileAttributes = ::GetFileAttributes(lpszPathName);
! 	m_bFileReadOnly = (dwFileAttributes & FILE_ATTRIBUTE_READONLY) != 0;
! 	pView->GetScintillaControl()->SetReadOnly(m_bFileReadOnly);
  	UpdateProjectFile();
  	SetLastAccessTime();
--- 339,343 ----
  	SetPathName(lpszPathName);
  	DWORD dwFileAttributes = ::GetFileAttributes(lpszPathName);
! 	pView->GetScintillaControl()->SetReadOnly((dwFileAttributes & FILE_ATTRIBUTE_READONLY) != 0);
  	UpdateProjectFile();
  	SetLastAccessTime();
***************
*** 423,427 ****
  		{
  			// The file has not changed, check read only flag
! 			if ((status.m_attribute & CFile::Attribute::readOnly) != m_bFileReadOnly)
  			{
  				if (status.m_attribute & CFile::Attribute::readOnly)
--- 420,424 ----
  		{
  			// The file has not changed, check read only flag
! 			if ((status.m_attribute & CFile::Attribute::readOnly) != pFirstView->GetScintillaControl()->GetReadOnly())
  			{
  				if (status.m_attribute & CFile::Attribute::readOnly)
***************
*** 435,446 ****
  						else
  				            m_tLastAccessTime = 0;	// Don't check anymore...
- 
- 						m_bFileReadOnly = true;
  					}
- 					else
- 						m_bFileReadOnly = true;
  				}
  				else
! 					m_bFileReadOnly = false;
  			}
  			m_bLockCheckLastAccessTime = false;
--- 432,439 ----
  						else
  				            m_tLastAccessTime = 0;	// Don't check anymore...
  					}
  				}
  				else
! 					pFirstView->GetScintillaControl()->SetReadOnly(false);
  			}
  			m_bLockCheckLastAccessTime = false;
***************
*** 952,961 ****
  }
  
- /// Gives true if file is read only or drive is read only like a CD-ROM.
- bool CAnyEditDoc::IsFileReadOnly()
- {
- 	return m_bFileReadOnly;
- }
- 
  /// Save current document to another file and remove old file.
  void CAnyEditDoc::OnFileMove()
--- 945,948 ----
***************
*** 1016,1037 ****
  	{
  		DWORD dwFileAttributes = ::GetFileAttributes(GetPathName());
! 		if (((dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? true : false) != pView->GetScintillaControl()->GetReadOnly())
  		{
! 			if (AfxMessageBox(StrPrintf("Do you want to set the file '%s' to read only too?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
! 			{
! 				DWORD dwFileAttributes = ::GetFileAttributes(GetPathName());
! 				if (dwFileAttributes & FILE_ATTRIBUTE_READONLY)
! 				{
! 					dwFileAttributes &= ~ FILE_ATTRIBUTE_READONLY;
! 					m_bFileReadOnly = false;
! 				}
! 				else
! 				{
! 					dwFileAttributes |= FILE_ATTRIBUTE_READONLY;
! 					m_bFileReadOnly = true;
! 				}
! 				::SetFileAttributes(GetPathName(), dwFileAttributes);
! 			}
  		}
  	}
  }
--- 1003,1015 ----
  	{
  		DWORD dwFileAttributes = ::GetFileAttributes(GetPathName());
! 		if( pView->GetScintillaControl()->GetReadOnly() )
  		{
! 			dwFileAttributes |= FILE_ATTRIBUTE_READONLY;
! 		}
! 		else
! 		{
! 			dwFileAttributes &= ~ FILE_ATTRIBUTE_READONLY;
  		}
+ 		::SetFileAttributes(GetPathName(), dwFileAttributes);
  	}
  }
***************
*** 1042,1050 ****
  void CAnyEditDoc::OnUpdateFileReadonly(CCmdUI* pCmdUI)
  {
- 	if (IsFileReadOnly())
- 		pCmdUI->Enable(FALSE);
- 	else
- 		pCmdUI->Enable(TRUE);
- 
  	CAnyEditView* pView = GetFirstEditView();
  	if (pView == NULL)
--- 1020,1023 ----
***************
*** 1052,1058 ****
--- 1025,1035 ----
  
  	if (pView->GetScintillaControl()->GetReadOnly())
+ 	{
  		pCmdUI->SetCheck(1);
+ 	}
  	else
+ 	{
  		pCmdUI->SetCheck(0);
+ 	}
  }
  

[Anyedit-cvs]AnyEditv2 ScintillaEx.cpp,1.28,1.29

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11780

Modified Files:
	ScintillaEx.cpp 
Log Message:
Fixed { indentation to not indent when it isn't the first character on the line.

Index: ScintillaEx.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ScintillaEx.cpp	17 Oct 2005 17:36:45 -0000	1.28
--- ScintillaEx.cpp	18 Oct 2005 17:46:31 -0000	1.29
***************
*** 1198,1201 ****
--- 1198,1204 ----
  			iIndentation = GetLineIndentation( iLine - 1 );
  
+ 			// Don't indent if the { isn't the first character after indentation.
+ 			if( GetCurrentPos() - 1 != GetLineIndentPosition( iLine ) )  return;
+ 
  			// Begin Undo
  			BeginUndoAction();

[Anyedit-cvs]AnyEditv2 AnyEditDoc.cpp,1.54,1.55

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10857

Modified Files:
	AnyEditDoc.cpp 
Log Message:
Fixed SetLanguageNr to update SyntaxHighlighting and BraceMatching settings for the new set language.

Index: AnyEditDoc.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** AnyEditDoc.cpp	16 Oct 2005 11:58:41 -0000	1.54
--- AnyEditDoc.cpp	18 Oct 2005 17:42:27 -0000	1.55
***************
*** 664,668 ****
  {
  	m_iLanguage = iLanguageNr;
! 	UpdateAllViews(NULL, VIEW_SYNTAX);
  }
  
--- 664,672 ----
  {
  	m_iLanguage = iLanguageNr;
! 	CScintillaEx* pScintilla = GetFirstEditView()->GetScintillaControl();
! 	m_bSyntaxHighlighting = theApp.GetFileTypeManager()->GetSyntaxHighlighting(m_iLanguage);
! 	m_bBraceMatching = theApp.GetFileTypeManager()->GetBraceMatching(m_iLanguage);
! 	theApp.GetFileTypeManager()->SetScintillaDefaultProperties(m_iLanguage, pScintilla);
! 	theApp.GetFileTypeManager()->SetScintillaProperties(m_iLanguage, pScintilla, m_bSyntaxHighlighting);
  }
  

[Anyedit-cvs]AnyEditv2 MainFrm.cpp,1.79,1.80

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10206

Modified Files:
	MainFrm.cpp 
Log Message:
Different scheme for OnMenuUpdate to retrieve current document.

Index: MainFrm.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** MainFrm.cpp	17 Oct 2005 17:17:29 -0000	1.79
--- MainFrm.cpp	18 Oct 2005 17:39:32 -0000	1.80
***************
*** 1530,1545 ****
  void CMainFrame::OnMenuLanguage(UINT uiId)
  {
! 	CMDIChildWnd* pActiveChild = MDIGetActive();
! 	if(pActiveChild)
  	{
! 		CView* pActiveView = pActiveChild->GetActiveView();
! 		if ( (pActiveView) && (pActiveView->IsKindOf(RUNTIME_CLASS(CAnyEditView))) )
! 		{
! 			CAnyEditDoc* pDocument = (CAnyEditDoc*)pActiveView->GetDocument();
! 			ASSERT(pDocument != NULL);
! 			pDocument->SetLanguageNr( uiId - ID_MENU_LANGUAGE );
! 		}
  	}
- 
  }
  
--- 1530,1538 ----
  void CMainFrame::OnMenuLanguage(UINT uiId)
  {
! 	CDocument* pDocument = theApp.GetCurrentDoc();
! 	if( NULL != pDocument && pDocument->IsKindOf( RUNTIME_CLASS( CAnyEditDoc ) ) )
  	{
! 		((CAnyEditDoc*)pDocument)->SetLanguageNr( uiId - ID_MENU_LANGUAGE );
  	}
  }
  

[Anyedit-cvs]AnyEditv2 AnyEditView.cpp,1.92,1.93 AnyEditView.h,1.52,1.53

[Leon W. <moo...@us...>]

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6889

Modified Files:
	AnyEditView.cpp AnyEditView.h 
Log Message:
Added MessageBox warning, when find next is back at the starting point of the search.
When find next goes past eof, the status bar is updated.

Index: AnyEditView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** AnyEditView.h	16 Oct 2005 12:01:30 -0000	1.52
--- AnyEditView.h	17 Oct 2005 17:40:24 -0000	1.53
***************
*** 77,80 ****
--- 77,83 ----
   	int m_ptIncrementalStartPos;
  
+ 	// Remember the start position of the find operation.
+ 	int m_iFindStartPos;
+ 
  	void UpdateStatusMessage(void);
  	bool HandleCommand(UINT nID);

Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** AnyEditView.cpp	16 Oct 2005 12:01:30 -0000	1.92
--- AnyEditView.cpp	17 Oct 2005 17:40:24 -0000	1.93
***************
*** 797,801 ****
  void CAnyEditView::OnSearchClearAllBookmarks()
  {
! 	m_Scintilla.ClearBookmarks();
  }
  
--- 797,801 ----
  void CAnyEditView::OnSearchClearAllBookmarks()
  {
! 	m_Scintilla.MarkerDeleteAll(SC_BOOKMARK);
  }
  
***************
*** 929,932 ****
--- 929,933 ----
  void CAnyEditView::OnSearchFind()
  {
+ 	m_iFindStartPos = m_Scintilla.GetCurrentPos();
  	CString strFind = m_Scintilla.GetFindString();
      CFindDialog fnd(NULL, &m_Scintilla, &strFind);
***************
*** 1451,1457 ****
  		else
  		{
- 			if (nPosFind < nCurrentPos)
- 				theApp.GetMainFrameWnd()->SetMessageText("Search has reached end of file");
  			m_Scintilla.SelectionFromTarget();
  		}
      }
--- 1452,1474 ----
  		else
  		{
  			m_Scintilla.SelectionFromTarget();
+ 			if(nCurrentPos > nPosFind)
+ 			{
+ 				theApp.GetMainFrameWnd()->SetMessageText("Search passed the end of file.");
+ 				if((m_iFindStartPos < nCurrentPos && m_iFindStartPos < nPosFind) ||
+ 				   (m_iFindStartPos > nCurrentPos && m_iFindStartPos > nPosFind))
+ 				{
+ 					// Find reached the start of the search.
+ 					AfxMessageBox("Find reached the start of the search.", MB_ICONINFORMATION|MB_OK);
+ //					theApp.GetMainFrameWnd()->SetMessageText("Search has reached end of file");
+ 				}
+ 			}
+ 			else
+ 			{
+ 				if(m_iFindStartPos < nPosFind && nCurrentPos < m_iFindStartPos)
+ 				{
+ 					AfxMessageBox("Find reached the start of the search.", MB_ICONINFORMATION|MB_OK);
+ 				}
+ 			}
  		}
      }