From 2a3be99dd6782316fd10ec4a5d1dc5a1e580dc4f Mon Sep 17 00:00:00 2001 From: putterman Date: Thu, 14 May 1998 18:46:17 +0000 Subject: [PATCH] Merged to Normandy git-svn-id: svn://10.0.0.236/branches/NORMANDY_BRANCH@1636 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/winfe/addrfrm.h | 604 +++++++++++++++++++++++++++++++++++- 1 file changed, 598 insertions(+), 6 deletions(-) diff --git a/mozilla/cmd/winfe/addrfrm.h b/mozilla/cmd/winfe/addrfrm.h index c886ccfd5b8..9f06e2c9832 100755 --- a/mozilla/cmd/winfe/addrfrm.h +++ b/mozilla/cmd/winfe/addrfrm.h @@ -29,7 +29,12 @@ #include "outliner.h" #include "apimsg.h" #include "xp_core.h" +#define MOZ_NEWADDR 1 +#ifdef MOZ_NEWADDR +#include "abcom.h" +#else #include "addrbook.h" +#endif #include "abmldlg.h" #include "mailfrm.h" #include "mnrccln.h" @@ -39,8 +44,17 @@ // sent to parent when illegal character hit // return 0 if you want parsed edit to beep -#define NETSCAPE_ADDRESS_FORMAT "Netscape Address Book Format" -#define ADDRESSBOOK_SOURCETARGET_FORMAT "Netscape Address Book source-target" +#define NETSCAPE_ADDRESS_FORMAT "Netscape Address Book Format" +#define ADDRESSBOOK_SOURCETARGET_FORMAT "Netscape Address Book source-target" +#define ADDRESSBOOK_INDEX_FORMAT "Netscape Address Book Index Format" +#define DIRLIST_SOURCETARGET_FORMAT "Directory List source-target" +#define DIRLIST_INDEX_FORMAT "Directory List Index Format" + +typedef struct { + MSG_Pane *m_pane; + int m_count; + MSG_ViewIndex *m_indices; +} AddressBookDragData; #define IDW_ADDRESS_SLIDER AFX_IDW_PANE_FIRST #define IDW_DIRECTORY_PANE (AFX_IDW_PANE_FIRST+1) @@ -56,10 +70,12 @@ #define ID_COLADDR_PHONE 5 #define ID_COLADDR_LOCALITY 6 #define ID_COLADDR_NICKNAME 7 +#define ID_RESULTS_COLNUM 7 #define DEF_DIRVISIBLE_COLUMNS 2 #define ID_COLDIR_TYPE 1 #define ID_COLDIR_NAME 2 +#define ID_CONT_COLNUM 2 // array of indexes for IDB_ADDRESSBOOK bitmap #define IDX_ADDRESSBOOKPERSON 0 @@ -69,10 +85,12 @@ // array of indexes for IDB_DIRLIST bitmap #define IDX_DIRLDAPAB 0 #define IDX_DIRPERSONALAB 1 +#define IDX_DIRMAILINGLIST 2 // call to build a menu of PABs void WFE_MSGBuildAddressBookPopup( HMENU hmenu, BOOL bInHeaders = FALSE ); + class CAddrCX: public CStubsCX { public: @@ -80,6 +98,578 @@ public: void DestroyContext(); }; +#ifdef MOZ_NEWADDR +class CAddrBookOutlinerOwner { + +public: + virtual BOOL IsSearching() = 0; + virtual AB_ContainerInfo * GetCurrentContainerInfo() =0; + virtual void SetSearchResults(MSG_ViewIndex where, int32 num) = 0; + virtual void OnUpdateDirectorySelection (int dirIndex, BOOL indexChanged) = 0; + virtual void SelectionChanged()=0; + virtual void DoubleClick() = 0; + virtual CWnd* GetOwnerWindow() = 0; +}; + +class CAddrBar; + +class CAddrBarEditWndOwner +{ +public: + virtual void SearchText(BOOL bImmediately) = 0; + +}; + +class CAddrBarEditWnd : public CEdit +{ +protected: + CAddrBarEditWndOwner *m_pOwner; + +public: + CAddrBarEditWnd(); + ~CAddrBarEditWnd(); + void SetOwner(CAddrBarEditWndOwner *pOwner) { m_pOwner = pOwner; } + virtual BOOL PreTranslateMessage ( MSG * msg ); + DECLARE_MESSAGE_MAP(); +}; + +/**************************************************************************** +* +* Class: CAddrBar +* +* DESCRIPTION: +* This class is used to process the dialog bar at the top of the address +* book. Mainly used for typedown. +* +****************************************************************************/ +class CAddrBar : public CDialogBar, public CAddrBarEditWndOwner +{ +public: + CAddrBar ( ); + virtual ~CAddrBar ( ); + void UpdateDirectories(); + +// Attributes +public: + int m_iWidth; + UINT m_uTypedownClock; + CString m_save; + HFONT m_pFont; + XP_Bool m_bRemoveLDAPDir; + CAddrBarEditWnd m_EditWnd; + +#ifdef XP_WIN16 + CSize m_sizeDefault; +#endif + +protected: + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CAddrBar) +public: + void ChangeDirectoryName (char * directoryName); +protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + + //{{AFX_DATA(CAddrBar) + CString m_name; + //}}AFX_DATA + +public: + BOOL Create( CWnd*, UINT, UINT, UINT ); + void ClearSavedText(); + void SearchText(BOOL bImmediately); + // Generated message map functions + //{{AFX_MSG(CAddrBar) + afx_msg int OnCreate( LPCREATESTRUCT ); + afx_msg void OnSize( UINT, int, int); + afx_msg void OnTimer( UINT ); + afx_msg void OnChangeName(); + afx_msg void OnSetFocusName(); + afx_msg void OnExtDirectorySearch(); + afx_msg void OnKillFocus( CWnd* pNewWnd ); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + +/**************************************************************************** +* +* Class: CAddrFrame +* +* DESCRIPTION: +* This class is used to as the main frame window for the address book. +* +****************************************************************************/ +class COutlinerView; +class CAddrOutliner; +class CAddrOutlinerParent; +class CDirOutliner; +class CDirOutlinerParent; +class CAddrEditProperties; +class CAddrEntryList; + + +class CAddrFrame : public CGenericFrame, public CStubsCX, public IMailFrame, + public CAddrBookOutlinerOwner { + DECLARE_DYNCREATE(CAddrFrame) + +// Attributes +protected: + + friend class CAddrEntryList; + + CAddrBar m_barAddr; + int m_iWidth; + + CMailNewsSplitter *m_pSplitter; + CAddrOutliner *m_pOutliner; + CAddrOutlinerParent *m_pOutlinerParent; + CDirOutliner *m_pDirOutliner; + CDirOutlinerParent *m_pDirOutlinerParent; + + LPMSGLIST m_pIAddrList; + MSG_Pane *m_addrBookPane; + MSG_Pane *m_addrContPane; + int32 m_iProgress; + BOOL m_bSearching; + +// CAddrFrame(); // protected constructor used by dynamic creation + virtual ~CAddrFrame(); + + // IUnknown Interface + STDMETHODIMP QueryInterface(REFIID,LPVOID *); + STDMETHODIMP_(ULONG) AddRef(void); + STDMETHODIMP_(ULONG) Release(void); + + // From CStubsCX + virtual void Progress(MWContext *pContext, const char *pMessage); + virtual void SetProgressBarPercent(MWContext *pContext, int32 lPercent); + virtual void AllConnectionsComplete(MWContext *pContext); + virtual CWnd *GetDialogOwner() const { return (CWnd *) this; } + + // Support for IMsgList Interface (Called by CAddrEntryList) + virtual void ListChangeStarting( MSG_Pane* pane, XP_Bool asynchronous, + MSG_NOTIFY_CODE notify, MSG_ViewIndex where, + int32 num); + virtual void ListChangeFinished( MSG_Pane* pane, XP_Bool asynchronous, + MSG_NOTIFY_CODE notify, MSG_ViewIndex where, + int32 num); + +// Operations +public: + CAddrFrame(); + static CAddrFrame *Open(); + static DIR_Server *DIRServerFromMenuID( UINT nID ); + static DIR_Server *DIRServerFromMenuID( UINT &nBase, UINT nID ); + static void UpdateMenu(HMENU hMenu, UINT &nID); + + // Support for IMailFrame + virtual CMailNewsFrame *GetMailNewsFrame(); + virtual MSG_Pane *GetPane(); + virtual void PaneChanged( MSG_Pane *pane, XP_Bool asynchronous, + MSG_PANE_CHANGED_NOTIFY_CODE, int32 value); + virtual void AttachmentCount(MSG_Pane *messagepane, void* closure, + int32 numattachments, XP_Bool finishedloading) {}; + virtual void UserWantsToSeeAttachments(MSG_Pane *messagepane, void *closure) {}; + + virtual MSG_Pane *GetResultsPane(); + virtual MSG_Pane *GetContainerPane(); + virtual MSG_Pane * GetFocusPane(); + virtual MSG_Pane * GetPaneForCommand(AB_CommandType cmd); + + + + enum { ToolInvalid = -1, ToolText = 0, ToolPictures = 1, ToolBoth = 2 }; + + // Callback from LDAP search + void SetSearchResults(MSG_ViewIndex index, int32 num); + XP_Bool IsSearching () { return m_bSearching; } + + void SelectionChanged() {}; + void DoubleClick(); + CWnd* GetOwnerWindow(); + + + void OnTypedown (char* name); + void OnUpdateDirectorySelection (int dirIndex, BOOL indexChanged = TRUE); + void OnExtendedDirectorySearch(); + void OnDirectoryList(char* searchString); + static void HandleErrorReturn(int XPErrorID, CWnd* parent = NULL, int errorID = 0); + static void Close(); + void UpdateDirectories(); + DIR_Server * GetCurrentDirectoryServer (); + AB_ContainerInfo * GetCurrentContainerInfo (); + + void DoUpdateAddressBook( CCmdUI* pCmdUI, AB_CommandType cmd, BOOL bUseCheck = TRUE ); + void DoAddressBookCommand(MSG_Pane *pPane, AB_CommandType cmd); + +protected: + void StartSearching(); + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CAddrFrame) + public: + protected: + virtual BOOL PreTranslateMessage( MSG* pMsg ); + virtual void RecalcLayout( BOOL bNotify = TRUE ) { CFrameWnd::RecalcLayout( bNotify ); } + virtual BOOL PreCreateWindow(CREATESTRUCT& cs); + virtual BOOL LoadFrame( UINT nIDResource, DWORD dwDefaultStyle = WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, + CWnd* pParentWnd = NULL, CCreateContext* pContext = NULL ); + virtual BOOL OnCreateClient( LPCREATESTRUCT lpcs, CCreateContext* pContext ); + virtual void PostNcDestroy( ) {}; // Overridden to prevent auto-delete on destroy + //}}AFX_VIRTUAL + +// Implementation +protected: + // Generated message map functions + //{{AFX_MSG(CAddrFrame) + afx_msg void OnGetMinMaxInfo( MINMAXINFO FAR* lpMMI ); + afx_msg int OnCreate(LPCREATESTRUCT); + afx_msg void OnUpdateSecureStatus(CCmdUI *pCmdUI); + afx_msg void OnClose(); + afx_msg void OnFileClose(); + afx_msg void OnSize(UINT, int, int); + afx_msg void OnExtDirectorySearch(); + afx_msg void OnUpdateSearch( CCmdUI *pCmdUI ); + afx_msg void OnImportFile(); + afx_msg void OnUpdateImport( CCmdUI *pCmdUI ); + afx_msg void OnExportFile(); + afx_msg void OnUpdateExport ( CCmdUI *pCmdUI ); + afx_msg void OnStopSearch(); + afx_msg void OnUpdateStopSearch ( CCmdUI *pCmdUI ); + afx_msg void OnViewCommandToolbar(); + afx_msg void OnUpdateViewCommandToolbar(CCmdUI* pCmdUI); + afx_msg void OnLDAPSearch(); + afx_msg void OnComposeMsg(void); + afx_msg void OnUpdateComposeMsg(CCmdUI*); + afx_msg void OnCall(void); + afx_msg void OnUpdateCall(CCmdUI*); + afx_msg void OnAddUser(void); + afx_msg void OnUpdateAddUser(CCmdUI*); + afx_msg void OnAddAB(void); + afx_msg void OnUpdateAddAB(CCmdUI*); + afx_msg void OnAddDir(void); + afx_msg void OnUpdateAddDir(CCmdUI*); + afx_msg void OnHTMLDomains(void); + afx_msg void OnUpdateHTMLDomains(CCmdUI*); + afx_msg void OnAddList(void); + afx_msg void OnUpdateAddList(CCmdUI*); + afx_msg void OnDeleteItem(void); + afx_msg void OnUpdateDeleteItem(CCmdUI*); + afx_msg void OnUndo(void); + afx_msg void OnUpdateUndo(CCmdUI*); + afx_msg void OnRedo(void); + afx_msg void OnUpdateRedo(CCmdUI*); + afx_msg void OnItemProperties(void); + afx_msg void OnUpdateItemProperties(CCmdUI*); + afx_msg void OnSortColumn0(void); + afx_msg void OnUpdateSortColumn0(CCmdUI*); + afx_msg void OnSortColumn1(void); + afx_msg void OnUpdateSortColumn1(CCmdUI*); + afx_msg void OnSortColumn2(void); + afx_msg void OnUpdateSortColumn2(CCmdUI*); + afx_msg void OnSortColumn3(void); + afx_msg void OnUpdateSortColumn3(CCmdUI*); + afx_msg void OnSortColumn4(void); + afx_msg void OnUpdateSortColumn4(CCmdUI*); + afx_msg void OnSortColumn5(void); + afx_msg void OnUpdateSortColumn5(CCmdUI*); + afx_msg void OnSortColumn6(void); + afx_msg void OnUpdateSortColumn6(CCmdUI*); + afx_msg void OnSortAscending(void); + afx_msg void OnUpdateSortAscending(CCmdUI*); + afx_msg void OnSortDescending(void); + afx_msg void OnUpdateSortDescending(CCmdUI*); + afx_msg void OnSave(); + afx_msg void OnDestroy(); + afx_msg void OnHelpMenu(); + afx_msg void OnUpdateShowAddressBookWindow(CCmdUI*); + afx_msg void OnCreateCard(); + afx_msg void OnUpdateEditCut(CCmdUI*); + afx_msg void OnEditCut(); + afx_msg void OnUpdateEditCopy(CCmdUI*); + afx_msg void OnEditCopy(); + afx_msg void OnUpdateDeleteFromAll(CCmdUI*); + afx_msg void OnEditDeleteFromAll(); + afx_msg void OnUpdateSelectAll(CCmdUI*); + afx_msg void OnSelectAll(); + afx_msg void OnUpdateDirectoryPane(CCmdUI*); + afx_msg void OnDirectoryPane(); + //}}AFX_MSG + + DECLARE_MESSAGE_MAP() +}; // END OF CLASS CAddrFrame() + +extern int ShowPropertySheetForEntry (MSG_Pane * pane, MWContext * context); +extern int ShowPropertySheetForDir(DIR_Server *server, MWContext *context, MSG_Pane *pane, + XP_Bool newDirectory); + +/**************************************************************************** +* +* Class: CAddrOutliner +* +* DESCRIPTION: +* This class is the column/list object in the address book +* +****************************************************************************/ +class CAddrOutliner : public CMSelectOutliner +{ +friend class CAddrOutlinerParent; + +protected: + int m_attribSortBy; + char* m_pszExtraText; + CLIPFORMAT m_cfAddresses; + CLIPFORMAT m_cfSourceTarget; + CLIPFORMAT m_cfAddrIndexes; + CLIPFORMAT m_cfDirIndexes; + MSG_Pane* m_pane; + int m_iMysticPlane; + BOOL m_bSortAscending; + MWContext* m_pContext; + AB_AttribID m_EntryAttrib [ID_RESULTS_COLNUM]; + AB_AttributeValue* m_pEntryValues; + uint16 m_intNumAttribs; + HFONT m_hFont; + CString m_psTypedown; + UINT m_uTypedownClock; + CAddrBookOutlinerOwner * m_pOutlinerOwner; + ABID m_selectedID; + +public: + CAddrOutliner ( ); + virtual ~CAddrOutliner ( ); + + void UpdateCount(); + void OnTypedown(int32 index); + void OnTypedown (char* name); + + int GetSortBy() { return m_attribSortBy; } + void SetDirectoryIndex (int dirIndex); + BOOL GetSortAscending() { return m_bSortAscending; } + + virtual void OnSelChanged(); + virtual void OnSelDblClk(); + + virtual HFONT GetLineFont( void *pLineData ); + virtual LPCTSTR GetColumnText ( UINT iColumn, void * pLineData ); + virtual void * AcquireLineData ( int iLine ); + virtual void ReleaseLineData ( void * pLineData ); + virtual void GetTreeInfo ( int iLine, uint32 * pFlags, int * iDepth, + OutlinerAncestorInfo ** pAncestor ); + virtual int TranslateIcon ( void *); + virtual int TranslateIconFolder ( void *); + + void SetPane( MSG_Pane *pane ); + MSG_Pane* GetPane() { return m_pane; } + + void SetOutlinerOwner(CAddrBookOutlinerOwner *pOwner) { m_pOutlinerOwner = pOwner;} + CAddrBookOutlinerOwner *GetOutlinerOwner() { return m_pOutlinerOwner;} + + MWContext *GetContext() { return m_pContext; } + void SetContext( MWContext *pContext ) { m_pContext = pContext; } + + virtual void MysticStuffStarting( XP_Bool asynchronous, + MSG_NOTIFY_CODE notify, + MSG_ViewIndex where, + int32 num); + virtual void MysticStuffFinishing( XP_Bool asynchronous, + MSG_NOTIFY_CODE notify, + MSG_ViewIndex where, + int32 num); + + virtual BOOL RenderData ( UINT iColumn, CRect & rect, CDC & pdc, const char * ); + virtual BOOL DeleteItem ( int iLine ); + + virtual BOOL ColumnCommand ( int iColumn, int iLine ); + + virtual void InitializeClipFormats(void); + virtual CLIPFORMAT * GetClipFormatList(void); + virtual void AcceptDrop(int iLineNo, COleDataObject *object, DROPEFFECT effect); + virtual DROPEFFECT DropSelect(int iLineNo, COleDataObject *pObject); + virtual COleDataSource * GetDataSource(void); + virtual void PropertyMenu ( int iSel, UINT flags ); + + + virtual BOOL IsSelected ( int iLine ); + + +protected: + virtual void AddSelection( MSG_ViewIndex iSel ); + virtual void RemoveSelection( MSG_ViewIndex iSel ); + virtual void RemoveSelectionRange( MSG_ViewIndex iSelBegin, MSG_ViewIndex iSelEnd ); + virtual void ClearSelection(); + + + // Implementation +protected: + // Generated message map functions + //{{AFX_MSG(CAddrOutliner) + afx_msg void OnTimer( UINT ); + afx_msg void OnKeyDown ( UINT nChar, UINT nRepCnt, UINT nFlags ); + afx_msg void OnKillFocus( CWnd* pNewWnd ); + afx_msg void OnSize( UINT, int, int); + //}}AFX_MSG + + DECLARE_MESSAGE_MAP() + +}; // END OF CLASS CAddrOutliner() + + +/**************************************************************************** +* +* Class: CAddrOutlinerParent +* +* DESCRIPTION: +* This class is the window around the column/list object in the address +* book. It is mainly purpose is to draw the column headings. +* +****************************************************************************/ +class CAddrOutlinerParent : public COutlinerParent +{ +public: + CAddrOutlinerParent(); + virtual ~CAddrOutlinerParent(); + virtual COutliner * GetOutliner ( ); + virtual void CreateColumns ( ); + virtual BOOL RenderData ( int idColumn, CRect & rect, CDC & dc, const char *); + virtual BOOL ColumnCommand ( int idColumn ); + +// Implementation +protected: + // Generated message map functions + //{{AFX_MSG(CAddrOutlinerParent) + afx_msg void OnDestroy(); + afx_msg void OnLButtonUp ( UINT nFlags, CPoint point ); + + //}}AFX_MSG + + DECLARE_MESSAGE_MAP() +}; + + +/**************************************************************************** +* +* Class: CDirOutliner +* +* DESCRIPTION: +* This class is the column/list object in the address book for directory +* and mailing list information +* +****************************************************************************/ +class CDirOutliner : public CMSelectOutliner +{ +friend class CDirOutlinerParent; + +protected: + int m_lineindex; + char* m_pszExtraText; + CLIPFORMAT m_cfAddresses; + CLIPFORMAT m_cfSourceTarget; + CLIPFORMAT m_cfAddrIndexes; + CLIPFORMAT m_cfDirIndexes; + MSG_Pane* m_pane; + int m_iMysticPlane; + AB_ContainerAttribValue* m_pLineValues; + uint16 m_numItems; + int m_dirIndex; + HFONT m_hFont; + OutlinerAncestorInfo * m_pAncestor; + AB_ContainerInfo** m_pSelection; + AB_ContainerInfo* m_pFocus; + CAddrBookOutlinerOwner *m_pOutlinerOwner; +public: + CDirOutliner ( ); + virtual ~CDirOutliner ( ); + + void UpdateCount(); + void OnChangeDirectory(int dirIndex); + int GetDirectoryIndex () { return m_dirIndex; } + + virtual void OnSelChanged(); + virtual void OnSelDblClk(); + + virtual HFONT GetLineFont( void *pLineData ); + virtual LPCTSTR GetColumnText ( UINT iColumn, void * pLineData ); + virtual void * AcquireLineData ( int iLine ); + virtual void ReleaseLineData ( void * pLineData ); + virtual void GetTreeInfo ( int iLine, uint32 * pFlags, int * iDepth, + OutlinerAncestorInfo ** pAncestor ); + virtual int TranslateIcon ( void *); + virtual int TranslateIconFolder ( void *); + virtual int ToggleExpansion ( int iLine ); + virtual int Expand ( int iLine ); + virtual int Collapse ( int iLine ); + + void SetOutlinerOwner(CAddrBookOutlinerOwner *pOwner) { m_pOutlinerOwner = pOwner;} + CAddrBookOutlinerOwner *GetOutlinerOwner() { return m_pOutlinerOwner;} + void SetPane( MSG_Pane *pane ); + MSG_Pane* GetPane() { return m_pane; } + + virtual void MysticStuffStarting( XP_Bool asynchronous, + MSG_NOTIFY_CODE notify, + MSG_ViewIndex where, + int32 num); + virtual void MysticStuffFinishing( XP_Bool asynchronous, + MSG_NOTIFY_CODE notify, + MSG_ViewIndex where, + int32 num); + +// virtual BOOL RenderData ( UINT iColumn, CRect & rect, CDC & pdc, const char * ); + virtual BOOL DeleteItem ( int iLine ); + + virtual BOOL ColumnCommand ( int iColumn, int iLine ); + + virtual void InitializeClipFormats(void); + virtual CLIPFORMAT * GetClipFormatList(void); + virtual void AcceptDrop(int iLineNo, COleDataObject *object, DROPEFFECT effect); + virtual DROPEFFECT DropSelect(int iLineNo, COleDataObject *pObject); + virtual COleDataSource * GetDataSource(void); + virtual void PropertyMenu ( int iSel, UINT flags ); + + // Implementation +protected: + // Generated message map functions + //{{AFX_MSG(CDirOutliner) + //}}AFX_MSG + + DECLARE_MESSAGE_MAP() + +}; // END OF CLASS CDirOutliner() + + +/**************************************************************************** +* +* Class: CDirOutlinerParent +* +* DESCRIPTION: +* This class is the window around the list of directories in the address +* book. It is mainly purpose is to draw the column headings. +* +****************************************************************************/ +class CDirOutlinerParent : public COutlinerParent +{ +public: + CDirOutlinerParent(); + virtual ~CDirOutlinerParent(); + virtual COutliner * GetOutliner ( ); + virtual void CreateColumns ( ); + virtual BOOL RenderData ( int idColumn, CRect & rect, CDC & dc, const char *); + virtual BOOL ColumnCommand ( int idColumn ); + +// Implementation +protected: + // Generated message map functions + //{{AFX_MSG(CDirOutlinerParent) + afx_msg void OnLButtonUp ( UINT nFlags, CPoint point ); + + //}}AFX_MSG + + DECLARE_MESSAGE_MAP() +}; + +#else /**************************************************************************** * * Class: CAddrBar @@ -205,6 +795,8 @@ protected: public: CAddrFrame(); static CAddrFrame *Open(); + static DIR_Server *DIRServerFromMenuID( UINT nID ); + static DIR_Server *DIRServerFromMenuID( UINT &nBase, UINT nID ); static void UpdateMenu(HMENU hMenu, UINT &nID); // Support for IMailFrame @@ -234,16 +826,13 @@ public: void UpdateDirectories(); DIR_Server * GetCurrentDirectoryServer (); -#ifndef _WIN32 - CWnd *CreateView(CCreateContext* pContext, UINT nID = AFX_IDW_PANE_FIRST); -#endif - void DoUpdateAddressBook( CCmdUI* pCmdUI, AB_CommandType cmd, BOOL bUseCheck = TRUE ); // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAddrFrame) public: + protected: virtual BOOL PreTranslateMessage( MSG* pMsg ); virtual void RecalcLayout( BOOL bNotify = TRUE ) { CFrameWnd::RecalcLayout( bNotify ); } @@ -254,6 +843,7 @@ public: virtual void PostNcDestroy( ) {}; // Overridden to prevent auto-delete on destroy //}}AFX_VIRTUAL + // Implementation protected: // Generated message map functions @@ -569,5 +1159,7 @@ protected: DECLARE_MESSAGE_MAP() }; +#endif + #endif