Context Navigation

← Previous Changeset
Next Changeset →

Changeset 133

Timestamp:

11/19/07 21:50:28 (1 year ago)

Author:

daboo

Message:

Fix for Win32 build.

Location:

Mulberry/branches/win32-merge-121/Win32/Sources

Files:

: 20 added
: 40 modified
: 2 moved

Application/Address_Book/CAddressBookView.h (modified) (1 diff)
Application/Address_Book/CAddressBookWindow.h (modified) (1 diff)
Application/Address_Book/CAddressPanelBase.h (modified) (1 diff)
Application/Address_Book/CAddressTable.cp (modified) (1 diff)
Application/Address_Book/CAddressView.h (modified) (1 diff)
Application/Address_Book_Manager/CAdbkManagerTable.h (modified) (1 diff)
Application/Address_Book_Manager/CAdbkManagerView.h (modified) (1 diff)
Application/Address_Search/CAdbkSearchTable.h (modified) (1 diff)
Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.h (modified) (1 diff)
Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreView.h (modified) (1 diff)
Application/Calendar/Calendar_View/Calendar_Window/CCalendarWindow.h (modified) (1 diff)
Application/Letter/CLetterWindow.h (modified) (1 diff)
Application/Letter/CMailboxPopup.h (modified) (1 diff)
Application/Letter/CMailboxToolbarPopup.h (modified) (1 diff)
Application/Mailbox/CMailboxView.h (modified) (2 diffs)
Application/Mailbox/CMailboxWindow.h (modified) (1 diff)
Application/Message/CCopyToMenu.h (modified) (2 diffs)
Application/Message/CMessageView.h (modified) (1 diff)
Application/Message/CMessageWindow.h (modified) (1 diff)
Application/Message/CReplyChooseDialog.h (modified) (1 diff)
Application/Rules/CApplyRulesMenu.h (modified) (1 diff)
Application/Rules/Dialog/CRulesDialog.h (modified) (1 diff)
Application/Search/CCriteriaBase.h (modified) (1 diff)
Application/Search/CSearchCriteriaContainer.h (modified) (1 diff)
Application/Search/CSearchWindow.h (modified) (1 diff)
Application/Server/CServerBrowse.cp (modified) (1 diff)
Application/Server/CServerBrowse.h (modified) (1 diff)
Application/Server/CServerView.h (modified) (1 diff)
Application/Server/CServerWindow.h (modified) (1 diff)
Formatting/CFontMenu.h (modified) (1 diff)
MulberryUnicode.cp (added)
PP_Sources/Hierarchy List/CNodeVectorTree.cp (modified) (1 diff)
PP_Sources/Hierarchy List/CNodeVectorTree.h (modified) (2 diffs)
Plugins/AddressBooks (moved) (moved from Mulberry/branches/win32-merge-121/Win32/Sources/Plugins/Address IO)
Plugins/PasswordChange (moved) (moved from Mulberry/branches/win32-merge-121/Win32/Sources/Plugins/Pswd Change)
Support/CCommander.h (modified) (1 diff)
Support/CSDIFrame.cp (modified) (6 diffs)
Support/CSDIFrame.h (modified) (2 diffs)
Support/CSubPanelController.h (modified) (2 diffs)
Support/CTabController.h (modified) (2 diffs)
Support/Toolbars/CToolbar.h (modified) (3 diffs)
Support/Toolbars/CToolbarView.cp (modified) (5 diffs)
Support/Toolbars/CToolbarView.h (modified) (2 diffs)
VCPP (added)
VCPP/algorithm.h (added)
VCPP/deque.h (added)
VCPP/iomanip.h (added)
VCPP/iostream.h (added)
VCPP/istream.h (added)
VCPP/map.h (added)
VCPP/mfcbits.cpp (added)
VCPP/numeric.h (added)
VCPP/ostream.h (added)
VCPP/queue.h (added)
VCPP/set.h (added)
VCPP/stack.h (added)
VCPP/stdint.h (added)
VCPP/streambuf.h (added)
VCPP/strstream.h (added)
VCPP/unistd.h (added)
VCPP/vector.h (added)
VCPP/winldap.h (added)

Legend:

: Unmodified
: Added
: Removed

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Address_Book/CAddressBookView.h

r126	r133
58	58	};
59	59
60		typedef svector<CAddressBookView*> CAddressBookViewList;
	60	typedef vector<CAddressBookView*> CAddressBookViewList;
61	61	static cdmutexprotect<CAddressBookViewList> sAddressBookViews; // List of windows (protected for multi-thread access)
62	62

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Address_Book/CAddressBookWindow.h

r126	r133
44	44	public:
45	45	static CAddressBookDocTemplate* sAddressBookDocTemplate;
46		typedef svector<CAddressBookWindow*> CAddressBookWindowList;
	46	typedef vector<CAddressBookWindow*> CAddressBookWindowList;
47	47	static cdmutexprotect<CAddressBookWindowList> sAddressBookWindows; // List of windows (protected for multi-thread access)
48	48

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Address_Book/CAddressPanelBase.h

r126	r133
54	54	};
55	55
56		typedef svector<CAddressPanelBase*> CAddressPanelList;
	56	typedef vector<CAddressPanelBase*> CAddressPanelList;
57	57
58	58	#endif

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Address_Book/CAddressTable.cp

r126	r133
403	403	// Create list to hold deleted items
404	404	CAddressList* addrs = new CAddressList();
405		~~addrs->set_keep_small(false);~~
406	405
407	406	// Add each selected address

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Address_Book/CAddressView.h

r126	r133
36	36	{
37	37	public:
38		typedef svector<CAddressView*> CAddressViewList;
	38	typedef vector<CAddressView*> CAddressViewList;
39	39	static cdmutexprotect<CAddressViewList> sAddressViews;
40	40

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Address_Book_Manager/CAdbkManagerTable.h

r126	r133
151	151	bool mListChanging; // In the process of changing the list
152	152	CColumnInfoArray* mColumnInfo;
153		svector<void*> mData; // data
	153	vector<void*> mData; // data
154	154	bool mHasOthers; // Indicates 'Other' item exists
155	155

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Address_Book_Manager/CAdbkManagerView.h

r126	r133
40	40
41	41	public:
42		typedef svector<CAdbkManagerView*> CAdbkManagerViewList;
	42	typedef vector<CAdbkManagerView*> CAdbkManagerViewList;
43	43	static cdmutexprotect<CAdbkManagerViewList> sAdbkManagerViews;
44	44

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Address_Search/CAdbkSearchTable.h

r126	r133
90	90	private:
91	91	CAdbkSearchWindow* mWindow;
92		svector<void*> mData; // data
	92	vector<void*> mData; // data
93	93	int mLastParent; // last parent row
94	94	CColumnInfoArray* mColumnInfo;

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.h

r126	r133
73	73	CCalendarStoreView* mTableView;
74	74	bool mListChanging; // In the process of changing the list
75		svector<calstore::CCalendarStoreNode*> mData; // data
	75	vector<calstore::CCalendarStoreNode*> mData; // data
76	76
77	77	virtual bool HandleKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); // Handle key down

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreView.h

r126	r133
39	39	{
40	40	public:
41		typedef svector<CCalendarStoreView*> CCalendarStoreViewList;
	41	typedef vector<CCalendarStoreView*> CCalendarStoreViewList;
42	42	static cdmutexprotect<CCalendarStoreViewList> sCalendarStoreViews; // List of windows (protected for multi-thread access)
43	43

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarWindow.h

r126	r133
46	46
47	47	public:
48		typedef svector<CCalendarWindow*> CCalendarWindowList;
	48	typedef vector<CCalendarWindow*> CCalendarWindowList;
49	49	static cdmutexprotect<CCalendarWindowList> sCalendarWindows; // List of windows (protected for multi-thread access)
50	50	static CMultiDocTemplate* sCalendarDocTemplate;

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Letter/CLetterWindow.h

r126	r133
82	82
83	83	public:
84		typedef svector<CLetterWindow*> CLetterWindowList;
	84	typedef vector<CLetterWindow*> CLetterWindowList;
85	85	static cdmutexprotect<CLetterWindowList> sLetterWindows; // List of windows (protected for multi-thread access)
86	86	static CMultiDocTemplate* sLetterDocTemplate;

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Letter/CMailboxPopup.h

r126	r133
64	64
65	65	private:
66		typedef svector<CMailboxPopup*> CMailboxPopupList;
	66	typedef vector<CMailboxPopup*> CMailboxPopupList;
67	67	static CMailboxPopupList sMailboxPopupMenus;
68	68

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Letter/CMailboxToolbarPopup.h

r126	r133
63	63
64	64	private:
65		typedef svector<CMailboxToolbarPopup*> CMailboxToolbarPopupList;
	65	typedef vector<CMailboxToolbarPopup*> CMailboxToolbarPopupList;
66	66	static CMailboxToolbarPopupList sMailboxToolbarPopupMenus;
67	67

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Mailbox/CMailboxView.h

r126	r133
79	79	};
80	80
81		typedef svector<CMailboxView*> CMailboxViewList;
	81	typedef vector<CMailboxView*> CMailboxViewList;
82	82	static cdmutexprotect<CMailboxViewList> sMailboxViews; // List of windows (protected for multi-thread access)
83	83
…	…
124	124	mMessageView = copy.mMessageView; }
125	125	};
126		typedef svector<SMailboxSubstitute> SMailboxSubstituteList;
	126	typedef vector<SMailboxSubstitute> SMailboxSubstituteList;
127	127
128	128	CMailboxView();

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Mailbox/CMailboxWindow.h

r126	r133
36	36	{
37	37	public:
38		typedef svector<CMailboxWindow*> CMailboxWindowList;
	38	typedef vector<CMailboxWindow*> CMailboxWindowList;
39	39	static cdmutexprotect<CMailboxWindowList> sMboxWindows; // List of windows (protected for multi-thread access)
40	40

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Message/CCopyToMenu.h

r126	r133
23	23	#include "CListener.h"
24	24
25		~~#include "svector.h"~~
26	25	#include "templs.h"
27	26	#include "cdstring.h"
…	…
67	66
68	67	private:
69		typedef svector<CMenu*> CMenuList;
	68	typedef vector<CMenu*> CMenuList;
70	69
71	70	static CMenu sCopyToMenu;

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Message/CMessageView.h

r126	r133
103	103	};
104	104
105		typedef svector<CMessageView*> CMessageViewList;
	105	typedef vector<CMessageView*> CMessageViewList;
106	106	static cdmutexprotect<CMessageViewList> sMsgViews; // List of windows (protected for multi-thread access)
107	107

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Message/CMessageWindow.h

r126	r133
110	110
111	111	public:
112		typedef svector<CMessageWindow*> CMessageWindowList;
	112	typedef vector<CMessageWindow*> CMessageWindowList;
113	113	static cdmutexprotect<CMessageWindowList> sMsgWindows; // List of windows (protected for multi-thread access)
114	114	static CMultiDocTemplate* sMessageDocTemplate;

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Message/CReplyChooseDialog.h

r126	r133
45	45	};
46	46
47		typedef svector<SReplyElement> CReplyList;
	47	typedef vector<SReplyElement> CReplyList;
48	48
49	49	class CReplyChooseTable : public CTable

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Rules/CApplyRulesMenu.h

r126	r133
23	23	#include "CListener.h"
24	24
25		~~#include "svector.h"~~
26	25	#include "templs.h"
27	26

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Rules/Dialog/CRulesDialog.h

r126	r133
39	39	class CFilterItem;
40	40	class CCriteriaBase;
41		typedef svector<CCriteriaBase*> CCriteriaBaseList;
	41	typedef vector<CCriteriaBase*> CCriteriaBaseList;
42	42
43	43

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Search/CCriteriaBase.h

r126	r133
30	30	// Classes
31	31	class CCriteriaBase;
32		typedef svector<CCriteriaBase*> CCriteriaBaseList;
	32	typedef vector<CCriteriaBase*> CCriteriaBaseList;
33	33
34	34	class CCriteriaBase : public CStatic, public CWndAligner

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Search/CSearchCriteriaContainer.h

r126	r133
33	33
34	34	class CCriteriaBase;
35		typedef svector<CCriteriaBase*> CCriteriaBaseList;
	35	typedef vector<CCriteriaBase*> CCriteriaBaseList;
36	36
37	37	class CSearchCriteriaContainer : public CWnd, public CBroadcaster, public CListener, public CWndAligner

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Search/CSearchWindow.h

r126	r133
40	40	class CSearchItem;
41	41
42		typedef svector<CSearchCriteria*> CSearchCriteriaList;
	42	typedef vector<CSearchCriteria*> CSearchCriteriaList;
43	43
44	44	class CSearchWindow : public CView, public CSearchBase, public CWndAligner

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Server/CServerBrowse.cp

r126	r133
85	85	mHierarchyCol = 0;
86	86
87		~~// Allow page size buffer for data~~
88		~~mData.set_keep_small(false);~~
89
90	87	// Do not listen until reset completed
91	88	Stop_Listening();

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Server/CServerBrowse.h

r126	r133
115	115	};
116	116
117		typedef svector<SServerBrowseData> CServerNodeArray;
	117	typedef vector<SServerBrowseData> CServerNodeArray;
118	118
119	119	CMboxProtocol* mServer; // Mail server associated with this window

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Server/CServerView.h

r126	r133
39	39
40	40	public:
41		typedef svector<CServerView*> CServerViewList;
	41	typedef vector<CServerView*> CServerViewList;
42	42	static cdmutexprotect<CServerViewList> sServerViews; // List of windows (protected for multi-thread access)
43	43

Mulberry/branches/win32-merge-121/Win32/Sources/Application/Server/CServerWindow.h

r126	r133
37	37
38	38	public:
39		typedef svector<CServerWindow*> CServerWindowList;
	39	typedef vector<CServerWindow*> CServerWindowList;
40	40	static cdmutexprotect<CServerWindowList> sServerWindows; // List of windows (protected for multi-thread access)
41	41	static CMultiDocTemplate* sServerDocTemplate;

Mulberry/branches/win32-merge-121/Win32/Sources/Formatting/CFontMenu.h

r126	r133
23	23	#include "CPopupButton.h"
24	24
25		~~#include "svector.h"~~
26
27	25	// Classes
28	26	class CFontElement;
29	27
30		typedef svector<CFontElement*> CFontList;
	28	typedef vector<CFontElement*> CFontList;
31	29
32	30	class CFontPopup : public CPopupButton

Mulberry/branches/win32-merge-121/Win32/Sources/PP_Sources/Hierarchy List/CNodeVectorTree.cp

r126	r133
33	33	{
34	34	mExposedNodes = 0;
35
36		~~// Use buffered vector~~
37		~~mHierarchyArray.set_keep_small(false); // Allocate memory in increments of page size~~
38	35	}
39	36

Mulberry/branches/win32-merge-121/Win32/Sources/PP_Sources/Hierarchy List/CNodeVectorTree.h

r126	r133
24	24	#include <WIN_LCollapsableTree.h>
25	25
26		~~#include "svector.h"~~
27
28	26	struct SHierarchyNode {
29	27	SHierarchyNode *parent;
…	…
37	35	};
38	36
39		typedef svector<SHierarchyNode*> CNodeVector;
	37	typedef vector<SHierarchyNode*> CNodeVector;
40	38
41	39	// ---------------------------------------------------------------------------

Mulberry/branches/win32-merge-121/Win32/Sources/Support/CCommander.h

r126	r133
49	49
50	50	protected:
51		typedef svector<CCommander*> CCommanders;
	51	typedef vector<CCommander*> CCommanders;
52	52
53	53	CCommander* mSuperCommander;

Mulberry/branches/win32-merge-121/Win32/Sources/Support/CSDIFrame.cp

r126	r133
34	34	// CSDIFrame
35	35
36		svector<CWnd*> CSDIFrame::sModalWnd;
	36	vector<CWnd*> CSDIFrame::sModalWnd;
37	37	CWnd* CSDIFrame::sTaskbarParent = NULL;
38	38	int CSDIFrame::sTaskbarCount = 0;
39	39	HMENU CSDIFrame::sWindowsMenu = NULL;
40		svector<CWnd*> CSDIFrame::sWindowList;
41		svector<CWnd*> CSDIFrame::sWindowZList;
	40	vector<CWnd*> CSDIFrame::sWindowList;
	41	vector<CWnd*> CSDIFrame::sWindowZList;
42	42	bool CSDIFrame::sWindowZListActive = false;
43	43	CWnd* CSDIFrame::sTopWindow = NULL;
…	…
273	273	// Find position in list
274	274	sWindowZList.erase(std::remove(sWindowZList.begin(), sWindowZList.end(), aWnd), sWindowZList.end());
275		svector<CWnd*>::iterator found = ::find(sWindowList.begin(), sWindowList.end(), aWnd);
	275	vector<CWnd*>::iterator found = ::find(sWindowList.begin(), sWindowList.end(), aWnd);
276	276	if (found != sWindowList.end())
277	277	{
…	…
307	307	// Refresh entire list
308	308	int pos = 0;
309		for(svector<CWnd*>::const_iterator iter = sWindowList.begin(); iter != sWindow