From f15c5188c311fae2035087df89c43fcab107335c Mon Sep 17 00:00:00 2001 From: Goober5000 Date: Wed, 18 Jan 2023 22:01:15 -0500 Subject: [PATCH] remove some obsolete FRED components - remove FolderDlg which hasn't been needed since we dropped support for Visual Studio 6 (see version history of MFC, https://mariusbancila.ro/blog/2015/08/12/version-history-of-vc-mfc-and-atl/) - remove dialog1 which isn't used --- fred2/CMakeLists.txt | 4 - fred2/dialog1.cpp | 47 ------- fred2/dialog1.h | 43 ------ fred2/folderdlg.cpp | 329 ------------------------------------------- fred2/folderdlg.h | 197 -------------------------- fred2/freddoc.cpp | 14 +- fred2/mainfrm.cpp | 8 -- fred2/mainfrm.h | 8 -- fred2/resource.h | 5 - 9 files changed, 1 insertion(+), 654 deletions(-) delete mode 100644 fred2/dialog1.cpp delete mode 100644 fred2/dialog1.h delete mode 100644 fred2/folderdlg.cpp delete mode 100644 fred2/folderdlg.h diff --git a/fred2/CMakeLists.txt b/fred2/CMakeLists.txt index 3683ec5b333..d7a5114ee6d 100644 --- a/fred2/CMakeLists.txt +++ b/fred2/CMakeLists.txt @@ -41,8 +41,6 @@ set(FRED2_SOURCES customwingnames.h debriefingeditordlg.cpp debriefingeditordlg.h - dialog1.cpp - dialog1.h dumpstats.cpp dumpstats.h editcontainernamedlg.cpp @@ -50,8 +48,6 @@ set(FRED2_SOURCES editor.h eventeditor.cpp eventeditor.h - folderdlg.cpp - folderdlg.h fred.cpp fred.h freddoc.cpp diff --git a/fred2/dialog1.cpp b/fred2/dialog1.cpp deleted file mode 100644 index 1acbb94ba0f..00000000000 --- a/fred2/dialog1.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) Volition, Inc. 1999. All rights reserved. - * - * All source code herein is the property of Volition, Inc. You may not sell - * or otherwise commercially exploit the source or things you created based on the - * source. - * -*/ - - - -#include "stdafx.h" -#include "FRED.h" -#include "dialog1.h" - -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// dialog1 dialog - -dialog1::dialog1(CWnd* pParent /*=NULL*/) - : CDialog(dialog1::IDD, pParent) -{ - //{{AFX_DATA_INIT(dialog1) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT -} - -void dialog1::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(dialog1) - // NOTE: the ClassWizard will add DDX and DDV calls here - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(dialog1, CDialog) - //{{AFX_MSG_MAP(dialog1) - // NOTE: the ClassWizard will add message map macros here - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// dialog1 message handlers diff --git a/fred2/dialog1.h b/fred2/dialog1.h deleted file mode 100644 index d4b52ff53fa..00000000000 --- a/fred2/dialog1.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) Volition, Inc. 1999. All rights reserved. - * - * All source code herein is the property of Volition, Inc. You may not sell - * or otherwise commercially exploit the source or things you created based on the - * source. - * -*/ - - - -///////////////////////////////////////////////////////////////////////////// -// dialog1 dialog - -class dialog1 : public CDialog -{ -// Construction -public: - dialog1(CWnd* pParent = NULL); // standard constructor - -// Dialog Data - //{{AFX_DATA(dialog1) - enum { IDD = IDD_HELP_INPUT_INTERFACE }; - // NOTE: the ClassWizard will add data members here - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(dialog1) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - - // Generated message map functions - //{{AFX_MSG(dialog1) - // NOTE: the ClassWizard will add member functions here - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; diff --git a/fred2/folderdlg.cpp b/fred2/folderdlg.cpp deleted file mode 100644 index f6d8f91bd77..00000000000 --- a/fred2/folderdlg.cpp +++ /dev/null @@ -1,329 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -/* -DESCRIPTION: - CFolderDialog - Folder Selection Dialog Class - Copyright(C) Armen Hakobyan, 2002 - 2005 - http://www.codeproject.com/dialog/cfolderdialog.asp - -VERSION HISTORY: - 24 Mar 2002 - First release - 30 Mar 2003 - Some minor changes - - Added missing in old Platform SDK new flag definitions - - Added support for both MFC 6.0 and 7.0 - - Added OnIUnknown handler for Windows XP folder filtration - - Added SetExpanded and SetOKText and GetSelectedFolder functions - 24 May 2003 - Added OnSelChanged implementation - 14 Jul 2003 - Added custom filtration for Windows XP, thanks to Arik Poznanski - 29 Nov 2003 - Added SetRootFolder, thanks to Eckhard Schwabe ( and Jose Insa ) - 02 Jan 2004 - Added GetRootFolder, uncomment if needed - 15 Feb 2005 - Small bug fix in DoModal, thanks to WindSeven -*/ -///////////////////////////////////////////////////////////////////////////// - -#include "FolderDlg.h" - -///////////////////////////////////////////////////////////////////////////// - -#ifndef BFFM_VALIDATEFAILED - #ifndef UNICODE - #define BFFM_VALIDATEFAILED 3 - #else - #define BFFM_VALIDATEFAILED 4 - #endif -#endif - -#ifndef BFFM_IUNKNOWN - #define BFFM_IUNKNOWN 5 -#endif - -///////////////////////////////////////////////////////////////////////////// -// CFolderDialog - -IMPLEMENT_DYNAMIC( CFolderDialog, CDialog ) - -CFolderDialog::CFolderDialog( IN LPCTSTR pszTitle /*NULL*/, - IN LPCTSTR pszSelPath /*NULL*/, - IN CWnd* pWndParent /*NULL*/, - IN UINT uFlags /*BIF_RETURNONLYFSDIRS*/ ) - : CCommonDialog( pWndParent ) - , m_hWnd( NULL ) -{ - ::ZeroMemory( &m_bi, sizeof( BROWSEINFO ) ); - ::ZeroMemory( m_szFolPath, MAX_PATH ); - ::ZeroMemory( m_szSelPath, MAX_PATH ); - - // Fill data - - m_bi.hwndOwner = pWndParent->GetSafeHwnd(); - m_bi.pidlRoot = NULL; - m_bi.lpszTitle = pszTitle; - m_bi.ulFlags = uFlags; - m_bi.lpfn = (BFFCALLBACK)&BrowseCallbackProc; - m_bi.lParam = (LPARAM)this; - - // The size of this buffer is assumed to be MAX_PATH bytes: - - m_bi.pszDisplayName = new TCHAR[ MAX_PATH ]; - ASSERT( m_bi.pszDisplayName != NULL ); - - SAFE_ZEROMEMORY( - m_bi.pszDisplayName, ( MAX_PATH * sizeof( TCHAR ) ) - ); - - if( pszSelPath ) - SetSelectedFolder( pszSelPath ); -} - -CFolderDialog::~CFolderDialog( VOID ) -{ - SAFE_COTASKMEMFREE( m_bi.pidlRoot ); - SAFE_DELETE2( m_bi.pszDisplayName ); - - ::ZeroMemory( &m_bi, sizeof( BROWSEINFO ) ); -} - -BEGIN_MESSAGE_MAP( CFolderDialog, CCommonDialog ) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CFolderDialog message handlers - -// SetRootFolder By Jose Insa -// Microsoft knowledge Base Article -// ID Q132750: Convert a File Path to an ITEMIDLIST - -BOOL CFolderDialog::SetRootFolder( IN LPCTSTR pszPath ) -{ - ASSERT_VALID( this ); - - if( !pszPath ) - { - SAFE_COTASKMEMFREE( m_bi.pidlRoot ); - return TRUE; - } - - ASSERT( AfxIsValidString( pszPath, MAX_PATH ) ); - - HRESULT hResult = S_FALSE; - IShellFolder* pDeskFolder = NULL; - - hResult = ::SHGetDesktopFolder( &pDeskFolder ); - if ( hResult == S_OK ) - { - LPITEMIDLIST pidlRoot = NULL; - LPTSTR pszRoot = const_cast< LPTSTR >( pszPath ); - - // Convert the path to an ITEMIDLIST: - - USES_CONVERSION; - - hResult = pDeskFolder->ParseDisplayName( - NULL, NULL, T2W( pszRoot ), NULL, &pidlRoot, NULL - ); - - if( hResult == S_OK ) - { - SAFE_COTASKMEMFREE( m_bi.pidlRoot ); - m_bi.pidlRoot = pidlRoot; - } - - SAFE_RELEASE( pDeskFolder ); - } - - return ( hResult == S_OK ); -} - -// NOTE: pszPath buffer must be at least -// MAX_PATH characters in size: - -BOOL CFolderDialog::GetRootFolder( IN OUT LPTSTR pszPath ) -{ - ASSERT_VALID( this ); - ASSERT( AfxIsValidString( pszPath, MAX_PATH ) ); - - return ::SHGetPathFromIDList( m_bi.pidlRoot, pszPath ); -} - -BOOL CFolderDialog::SetSelectedFolder( IN LPCTSTR pszPath ) -{ - ASSERT( AfxIsValidString( pszPath, MAX_PATH ) ); - return (BOOL)::lstrcpy( m_szSelPath, pszPath ); -} - -///////////////////////////////////////////////////////////////////////////// - -#if ( _MFC_VER >= 0x0700 ) - INT_PTR CFolderDialog::DoModal( VOID ) -#else - INT CFolderDialog::DoModal( VOID ) -#endif -{ - ASSERT_VALID( this ); - ASSERT( m_bi.lpfn != NULL ); - - INT_PTR nRet = -1; - m_bi.hwndOwner = PreModal(); - - LPITEMIDLIST pItemIDList = ::SHBrowseForFolder( &m_bi ); - if( pItemIDList ) - { - if( ::SHGetPathFromIDList( pItemIDList, m_szFolPath ) ) - nRet = IDOK; - - SAFE_COTASKMEMFREE( pItemIDList ); - } - else - nRet = IDCANCEL; - - - PostModal(); - return ( nRet ); -} - -///////////////////////////////////////////////////////////////////////////// -// Overridables: - -VOID CFolderDialog::OnInitialized( VOID ) -{ - if( ::lstrlen( m_szSelPath ) > 0 ) //-V805 - SetSelection( m_szSelPath ); -} - -VOID CFolderDialog::OnSelChanged( IN LPITEMIDLIST pItemIDList ) -{ - if( m_bi.ulFlags & BIF_STATUSTEXT ) - { - TCHAR szSelFol[ MAX_PATH ] = { 0 }; - if( ::SHGetPathFromIDList( pItemIDList, szSelFol ) ) - SetStatusText( szSelFol ); - } -} - -INT CFolderDialog::OnValidateFailed( IN LPCTSTR /*pszPath*/ ) -{ - ::MessageBeep( MB_ICONHAND ); - return 1; // Return 1 to leave dialog open, 0 - to end one -} - -VOID CFolderDialog::OnIUnknown( IN IUnknown* /*pIUnknown*/ ) -{ -} - -///////////////////////////////////////////////////////////////////////////// -// Callback function used with the SHBrowseForFolder function. - -INT CALLBACK CFolderDialog::BrowseCallbackProc( IN HWND hWnd, - IN UINT uMsg, - IN LPARAM lParam, - IN LPARAM lpData ) -{ - CFolderDialog* pThis = (CFolderDialog*)lpData; - ASSERT( pThis != NULL ); - - INT nRet = 0; - pThis->m_hWnd = hWnd; - - switch( uMsg ) - { - case BFFM_INITIALIZED: - pThis->OnInitialized(); - break; - case BFFM_SELCHANGED: - pThis->OnSelChanged( (LPITEMIDLIST)lParam ); - break; - case BFFM_VALIDATEFAILED: - nRet = pThis->OnValidateFailed( (LPCTSTR)lParam ); - break; - case BFFM_IUNKNOWN: - pThis->OnIUnknown( (IUnknown*)lParam ); - break; - default: - ASSERT( FALSE ); - break; - } - - pThis->m_hWnd = NULL; - return nRet; -} - -///////////////////////////////////////////////////////////////////////////// -// Commands, valid to call only from handlers - -VOID CFolderDialog::SetExpanded( IN LPCTSTR pszPath ) -{ - USES_CONVERSION; - - ASSERT( m_hWnd != NULL ); - ASSERT( AfxIsValidString( pszPath, MAX_PATH ) ); - - ::SendMessage( - m_hWnd, BFFM_SETEXPANDED, - (WPARAM)TRUE, (LPARAM)T2CW( pszPath ) - ); -} - -VOID CFolderDialog::SetOKText( IN LPCTSTR pszText ) -{ - USES_CONVERSION; - - ASSERT( m_hWnd != NULL ); - - ::SendMessage( - m_hWnd, BFFM_SETOKTEXT, - (WPARAM)0, (LPARAM)T2CW( pszText ) - ); -} - -VOID CFolderDialog::EnableOK( IN BOOL bEnable /*TRUE*/ ) -{ - ASSERT( m_hWnd != NULL ); - - ::SendMessage( - m_hWnd, BFFM_ENABLEOK, (WPARAM)bEnable, 0L - ); -} - -VOID CFolderDialog::SetSelection( IN LPITEMIDLIST pItemIDList ) -{ - ASSERT( m_hWnd != NULL ); - - ::SendMessage( - m_hWnd, BFFM_SETSELECTION, - (WPARAM)FALSE, (LPARAM)pItemIDList - ); -} - -VOID CFolderDialog::SetSelection( IN LPCTSTR pszPath ) -{ - ASSERT( m_hWnd != NULL ); - ASSERT( AfxIsValidString( pszPath, MAX_PATH ) ); - - ::SendMessage( - m_hWnd, BFFM_SETSELECTION, - (WPARAM)TRUE, (LPARAM)pszPath - ); -} - -VOID CFolderDialog::SetStatusText( IN LPCTSTR pszText ) -{ - ASSERT( m_hWnd != NULL ); - - ::SendMessage( - m_hWnd, BFFM_SETSTATUSTEXT, - (WPARAM)0, (LPARAM)pszText - ); -} - -// Shell version 5.0 or later: - -VOID CFolderDialog::SetExpanded( IN LPITEMIDLIST pItemIDList ) -{ - ASSERT( m_hWnd != NULL ); - - ::SendMessage( - m_hWnd, BFFM_SETEXPANDED, - (WPARAM)FALSE, (LPARAM)pItemIDList - ); -} - -///////////////////////////////////////////////////////////////////////////// diff --git a/fred2/folderdlg.h b/fred2/folderdlg.h deleted file mode 100644 index 37593c6aeae..00000000000 --- a/fred2/folderdlg.h +++ /dev/null @@ -1,197 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -/* -DESCRIPTION: - CFolderDialog - Folder Selection Dialog Class - Copyright(C) Armen Hakobyan, 2002 - 2005 - http://www.codeproject.com/dialog/cfolderdialog.asp - -VERSION HISTORY: - 24 Mar 2002 - First release - 30 Mar 2003 - Some minor changes - - Added missing in old Platform SDK new flag definitions - - Added support for both MFC 6.0 and 7.0 - - Added OnIUnknown handler for Windows XP folder filtration - - Added SetExpanded and SetOKText and GetSelectedFolder functions - 24 May 2003 - Added OnSelChanged implementation - 14 Jul 2003 - Added custom filtration for Windows XP, thanks to Arik Poznanski - 29 Nov 2003 - Added SetRootFolder, thanks to Eckhard Schwabe ( and Jose Insa ) - 02 Jan 2004 - Added GetRootFolder, uncomment if needed - 15 Feb 2005 - Small bug fix in DoModal, thanks to WindSeven -*/ -///////////////////////////////////////////////////////////////////////////// - -#ifndef __FOLDERDLG_H__ -#define __FOLDERDLG_H__ - -#if defined( _MSC_VER ) && ( _MSC_VER >= 1020 ) - #pragma once -#endif - -///////////////////////////////////////////////////////////////////////////// - -#ifndef __AFXDLGS_H__ - #include < AfxDlgs.h > -#endif - -// Goober5000 - dunno why this wasn't included in the first place -#ifndef _INC_SHLOBJ - #include -#endif - -#ifndef __ATLCONV_H__ - #include < AtlConv.h > // MBCS/Unicode Conversion Macros -#endif - -// Uncomment if using GetRootFolder -//#ifndef _INC_SHLWAPI -// #include < shlwapi.h > -//#endif -//#pragma comment( lib, "shlwapi.lib" ) - -///////////////////////////////////////////////////////////////////////////// - -#ifndef SAFE_DELETE2 - #define SAFE_DELETE2( p ) \ - if( p ){ delete[] p; p = NULL; } -#endif - -#ifndef SAFE_ZEROMEMORY - #define SAFE_ZEROMEMORY( p, size ) \ - if( p ){ ZeroMemory( p, size ); } -#endif - -#ifndef SAFE_RELEASE - #if defined( __cplusplus ) - #define SAFE_RELEASE( p ) \ - if( p ){ p->Release(); p = NULL; } - #else - #define SAFE_RELEASE( p ) \ - if( p ){ p->lpVtbl->Release( p ); p = NULL; } - #endif -#endif - -#ifndef SAFE_COTASKMEMFREE - #define SAFE_COTASKMEMFREE( p ) \ - if( p ){ CoTaskMemFree( (LPVOID)p ); p = NULL; } -#endif - -#ifndef _countof - #define _countof( x ) \ - ( sizeof( x ) / sizeof( x[ 0 ] ) ) -#endif - -///////////////////////////////////////////////////////////////////////////// - -#ifndef BFFM_SETOKTEXT // Version 5.0 or later - #define BFFM_SETOKTEXT ( WM_USER + 105 ) // Unicode only, req. BIF_USENEWUI - #define BFFM_SETEXPANDED ( WM_USER + 106 ) // Unicode only, req. BIF_USENEWUI -#endif - -#ifndef BIF_NEWDIALOGSTYLE // Version 5.0 or later - #define BIF_NEWDIALOGSTYLE 0x0040 - #define BIF_BROWSEINCLUDEURLS 0x0080 - #define BIF_UAHINT 0x0100 // Req. BIF_NEWDIALOGSTYLE - #define BIF_NONEWFOLDERBUTTON 0x0200 - #define BIF_NOTRANSLATETARGETS 0x0400 - #define BIF_SHAREABLE 0x8000 // Req. BIF_USENEWUI - #define BIF_USENEWUI ( BIF_NEWDIALOGSTYLE | BIF_EDITBOX ) -#endif - -///////////////////////////////////////////////////////////////////////////// - -class CFolderDialog : public CCommonDialog -{ - DECLARE_DYNAMIC( CFolderDialog ) - -public: - CFolderDialog( IN LPCTSTR pszTitle = NULL, - IN LPCTSTR pszSelPath = NULL, - IN CWnd* pWndParent = NULL, - IN UINT uFlags = BIF_RETURNONLYFSDIRS ); - virtual ~CFolderDialog( VOID ); - -public: - #if ( _MFC_VER >= 0x0700 ) // VC++ 2002 (7.0) - virtual INT_PTR DoModal( VOID ); - #else - virtual INT DoModal( VOID ); - #endif - - BOOL SetRootFolder( IN LPCTSTR pszPath ); - BOOL GetRootFolder( IN OUT LPTSTR pszPath ); - BOOL SetSelectedFolder( IN LPCTSTR pszPath ); - -public: - AFX_INLINE LPCTSTR GetFolderPath( VOID ) const; - AFX_INLINE LPCTSTR GetFolderName( VOID ) const; - AFX_INLINE INT GetFolderImage( VOID ) const; - AFX_INLINE LPCTSTR GetSelectedFolder( VOID ) const; - - AFX_INLINE BROWSEINFO& GetBI( VOID ); - AFX_INLINE const BROWSEINFO& GetBI( VOID ) const; - -protected: - BROWSEINFO m_bi; - - TCHAR m_szSelPath[ MAX_PATH ]; - TCHAR m_szFolPath[ MAX_PATH ]; - -protected: - DECLARE_MESSAGE_MAP() - -protected: // Overridables - - virtual VOID OnInitialized( VOID ); - virtual VOID OnSelChanged( IN LPITEMIDLIST pItemIDList ); - virtual INT OnValidateFailed( IN LPCTSTR /*pszPath*/ ); - -protected: // Windows XP or later - virtual VOID OnIUnknown( IN IUnknown* /*pIUnknown*/ ); - -protected: // Valid to call only from the above handlers - - VOID EnableOK( IN BOOL bEnable = TRUE ); - VOID SetSelection( IN LPITEMIDLIST pItemIDList ); - VOID SetSelection( IN LPCTSTR pszPath ); - VOID SetStatusText( IN LPCTSTR pszText ); - -protected: // Shell version 5.0 or later: - VOID SetExpanded( IN LPCTSTR pszPath ); - VOID SetExpanded( IN LPITEMIDLIST pItemIDList ); - VOID SetOKText( IN LPCTSTR pszText ); - -private: - HWND m_hWnd; // used only in the callback function - -private: - static INT CALLBACK BrowseCallbackProc( - IN HWND hWnd, IN UINT uMsg, IN LPARAM lParam, IN LPARAM lpData - ); -}; - -///////////////////////////////////////////////////////////////////////////// - -AFX_INLINE LPCTSTR CFolderDialog::GetSelectedFolder( VOID ) const - { return m_szSelPath; } - -AFX_INLINE BROWSEINFO& CFolderDialog::GetBI( VOID ) - { return m_bi; } - -AFX_INLINE const BROWSEINFO& CFolderDialog::GetBI( VOID ) const - { return m_bi; } - -///////////////////////////////////////////////////////////////////////////// -// Filled after a call to DoModal - -AFX_INLINE LPCTSTR CFolderDialog::GetFolderPath( VOID ) const - { return m_szFolPath; } - -AFX_INLINE LPCTSTR CFolderDialog::GetFolderName( VOID ) const - { return m_bi.pszDisplayName; } - -AFX_INLINE INT CFolderDialog::GetFolderImage( VOID ) const - { return m_bi.iImage; } - -///////////////////////////////////////////////////////////////////////////// -#endif // __FOLDERDLG_H__ -///////////////////////////////////////////////////////////////////////////// diff --git a/fred2/freddoc.cpp b/fred2/freddoc.cpp index cd3c5f9b666..ba36ce90fd4 100644 --- a/fred2/freddoc.cpp +++ b/fred2/freddoc.cpp @@ -13,11 +13,11 @@ #include "stdafx.h" #include "FRED.h" -#include "FolderDlg.h" #include //#include //#include +#include #include "FREDDoc.h" #include "FREDView.h" @@ -426,11 +426,6 @@ void CFREDDoc::OnFileImportFSM() { memset(dest_directory, 0, sizeof(dest_directory)); // get location to save to -#if ( _MFC_VER >= 0x0700 ) - //ITEMIDLIST fs2_mission_pidl = {0}; - - //SHParseDisplayName(A2CW(fs2_mission_path), NULL, fs2_mission_pidl, 0, 0); - BROWSEINFO bi; bi.hwndOwner = theApp.GetMainWnd()->GetSafeHwnd(); //bi.pidlRoot = &fs2_mission_pidl; @@ -448,13 +443,6 @@ void CFREDDoc::OnFileImportFSM() { return; SHGetPathFromIDList(ret_val, dest_directory); -#else - CFolderDialog dlgFolder(_T("Select a location to save in"), fs2_mission_path, NULL); - if (dlgFolder.DoModal() != IDOK) - return; - - strcpy_s(dest_directory, dlgFolder.GetFolderPath()); -#endif // clean things up first if (Briefing_dialog) diff --git a/fred2/mainfrm.cpp b/fred2/mainfrm.cpp index f35ea895778..8b3f12e496f 100644 --- a/fred2/mainfrm.cpp +++ b/fred2/mainfrm.cpp @@ -19,7 +19,6 @@ #include "ShipClassEditorDlg.h" #include "MissionNotesDlg.h" #include "Grid.h" -#include "dialog1.h" #include "species_defs/species_defs.h" #include "iff_defs/iff_defs.h" @@ -48,7 +47,6 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) ON_COMMAND(IDR_MENU_POPUP_TOGGLE1, OnMenuPopupToggle1) ON_UPDATE_COMMAND_UI(IDR_MENU_POPUP_TOGGLE1, OnUpdateMenuPopupToggle1) ON_WM_RBUTTONDOWN() - ON_COMMAND(ID_HELP_INPUT_INTERFACE, OnHelpInputInterface) ON_WM_CLOSE() ON_WM_INITMENU() ON_COMMAND(ID_HELP_FINDER, OnFredHelp) @@ -274,12 +272,6 @@ void CMainFrame::OnFredHelp() { url_launch(res.full_name.c_str()); } -void CMainFrame::OnHelpInputInterface() { - dialog1 dlg; - - dlg.DoModal(); -} - void CMainFrame::OnInitMenu(CMenu* pMenu) { int i; CString str; diff --git a/fred2/mainfrm.h b/fred2/mainfrm.h index f597381b566..3ad74be4c34 100644 --- a/fred2/mainfrm.h +++ b/fred2/mainfrm.h @@ -168,14 +168,6 @@ class CMainFrame : public CFrameWnd */ afx_msg void OnRButtonDown(UINT nFlags, CPoint point); - /** - * @brief Calls dialog1 - * - * @note Not sure if this is actually useful - * @TODO Verify and remove - */ - afx_msg void OnHelpInputInterface(); - /** * @brief Handler for OnClose() events. called by ON_WM_CLOSE() */ diff --git a/fred2/resource.h b/fred2/resource.h index f4d440d8dc3..cf9a9bb46ef 100644 --- a/fred2/resource.h +++ b/fred2/resource.h @@ -31,11 +31,7 @@ #define IDD_SHIP_EDITOR 176 #define IDD_WEAPON_EDITOR 177 #define IDD_SHIP_MARKINGS 178 -#define IDD_DIALOG1 179 #define IDD_MISSION_GOALS 179 -#define IDD_DIALOG2 180 -#define IDD_HELP_INPUT_INTERFACE 180 -#define IDD_DIALOG3 181 #define IDD_SHIP_SELECT 181 #define IDD_GRID 182 #define IDR_MENU_SHIP_POPUP 183 @@ -1302,7 +1298,6 @@ #define ID_EDIT_TEXT 32857 #define ID_ADD_TRUE 32858 #define ID_ADD_FALSE 32859 -#define ID_HELP_INPUT_INTERFACE 32860 #define ID_ADD_LESS_THAN 32861 #define ID_ADD_ELAPSED_TIME 32862 #define ID_ADD_TIME_SHIP_DESTROYED 32863