[win] Delete Help/Demo Menu Item

Delete Demo submenu item under Help menu that is inactive after commit 21f526.
CelestiaProject · Oct 18, 2023 · 23410a7 · 23410a7
1 parent b5242e1
commit 23410a7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/src/celestia/win32/res/celestia.rc b/src/celestia/win32/res/celestia.rc
@@ -260,8 +260,6 @@ IDR_MAIN_MENU MENU
     }
     POPUP "&Help"
     {
-        MENUITEM "Run &Demo", ID_HELP_RUNDEMO
-        MENUITEM SEPARATOR
         MENUITEM "User &Guide", ID_HELP_GUIDE
         MENUITEM "&Controls", ID_HELP_CONTROLS
         MENUITEM "&OpenGL Info", ID_HELP_GLINFO

diff --git a/src/celestia/win32/res/resource.h b/src/celestia/win32/res/resource.h
@@ -229,7 +229,6 @@
 #define ID_BOOKMARKS_ADDBOOKMARK        40034
 #define ID_RENDER_LOCATIONS             40035
 #define ID_INFO                         40040
-#define ID_HELP_RUNDEMO                 40041
 #define ID_RENDER_MORESTARS             40042
 #define ID_RENDER_FEWERSTARS            40043
 #define ID_RENDER_AUTOMAG               40044

diff --git a/src/celestia/win32/winmain.cpp b/src/celestia/win32/winmain.cpp
@@ -3697,14 +3697,14 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
 
         //Associate some menu items with bitmap resources
         odAppMenu.SetItemImage(appInstance, ID_FILE_OPENSCRIPT, IDB_SCRIPT);
+        odAppMenu.SetItemImage(appInstance, ID_FILE_RUNDEMO, IDB_SCRIPT);
         odAppMenu.SetItemImage(appInstance, ID_FILE_CAPTUREIMAGE, IDB_CAMERA);
         odAppMenu.SetItemImage(appInstance, ID_FILE_CAPTUREMOVIE, IDB_CAMCORDER);
         odAppMenu.SetItemImage(appInstance, ID_FILE_EXIT, IDB_EXIT);
         odAppMenu.SetItemImage(appInstance, ID_TIME_SETTIME, IDB_CLOCK);
         odAppMenu.SetItemImage(appInstance, ID_TIME_FREEZE, IDB_STOP);
         odAppMenu.SetItemImage(appInstance, ID_RENDER_VIEWOPTIONS, IDB_SUNGLASSES);
         odAppMenu.SetItemImage(appInstance, ID_RENDER_LOCATIONS, IDB_GLOBE);
-        odAppMenu.SetItemImage(appInstance, ID_HELP_RUNDEMO, IDB_SCRIPT);
         odAppMenu.SetItemImage(appInstance, ID_HELP_CONTROLS, IDB_CONFIG);
         odAppMenu.SetItemImage(appInstance, ID_HELP_ABOUT, IDB_ABOUT);
         odAppMenu.SetItemImage(appInstance, ID_BOOKMARKS_ADDBOOKMARK, IDB_BOOKMARK_ADD);
@@ -4323,10 +4323,6 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
             DialogBox(hRes, MAKEINTRESOURCE(IDD_ORGANIZE_BOOKMARKS), hWnd, (DLGPROC)OrganizeBookmarksProc);
             break;
 
-        case ID_HELP_RUNDEMO:
-            appCore->charEntered('D');
-            break;
-
         case ID_HELP_GUIDE:
             ShellExecute(hWnd, "open", "help\\CelestiaGuide.html", NULL, NULL, SW_NORMAL);
             break;