[Anyedit-cvs] AnyEditv2 AnyEditView.cpp, 1.95, 1.96 ClassTree.cpp, 1.18, 1.19 FileEditCtrl.cpp, 1.3

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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