Index: src/ch/FolderDialog.h =================================================================== diff -u -r8b7479db2ee71a3d00779c67fe6a1b1d9ec414b8 -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d --- src/ch/FolderDialog.h (.../FolderDialog.h) (revision 8b7479db2ee71a3d00779c67fe6a1b1d9ec414b8) +++ src/ch/FolderDialog.h (.../FolderDialog.h) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d) @@ -44,42 +44,32 @@ { // Construction public: - CFolderDialog(CWnd* pParent = NULL); // standard constructor + explicit CFolderDialog(CWnd* pParent = NULL); // standard constructor virtual ~CFolderDialog(); -// Dialog Data - //{{AFX_DATA(CFolderDialog) - //}}AFX_DATA - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CFolderDialog) - public: +public: virtual INT_PTR DoModal(); - protected: + +protected: virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); - //}}AFX_VIRTUAL public: virtual BOOL OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip); // structure used for passing parameters struct BROWSEDATA { - BROWSEDATA() { cx=0; cy=0; iView=2; bExtended=false; }; -// BROWSEDATA& operator=(const BROWSEDATA& data) { strCaption=data.strCaption; strText=data.strText; strInitialDir=data.strInitialDir; astrRecent.Copy(data.astrRecent); -// ascShortcuts.Copy(data.ascShortcuts); cx=data.cx; cy=data.cy; iView=data.iView; bExtended=data.bExtended; return *this;}; - CString strCaption; CString strText; CString strInitialDir; std::vector cvRecent; std::vector cvShortcuts; - int cx, cy; // pixels - int iView; // type of view (large icons, small icons, ...) - bool bExtended; // with the shortcuts or not - bool bIgnoreDialogs; // if tree ctrl should show shell dialogs in style 'insert floppy' + int cx = 0; + int cy = 0; // pixels + int iView = 2; // type of view (large icons, small icons, ...) + bool bExtended = false; // with the shortcuts or not + bool bIgnoreDialogs = true; // if tree ctrl should show shell dialogs in style 'insert floppy' } m_bdData; // getting path - after dialog exits @@ -100,7 +90,6 @@ void ResizeControls(int cx, int cy); CString m_strTip; // for tooltip storage - TCHAR m_szBuffer[2048]; // shell functions buffer CString m_strPath; // for path after dialog exits bool m_bIgnoreUpdate; // ignores nearest edit update (with path)