[Anyedit-cvs] AnyEditv2/includes BCGCB.h, 1.2, 1.3 BCGContextMenuManager.h, 1.1, 1.2 BCGControlBar.

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

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: