Debugger: Keep pop up menus to ContextMenu only.

This commit is contained in:
Unknown W. Brackets 2021-10-07 19:53:40 -07:00
parent 39d3b4d933
commit 09f4e82aa7
5 changed files with 12 additions and 9 deletions

View file

@ -2,8 +2,6 @@
#include "Common/CommonWindows.h"
#include "Core/Debugger/DebugInterface.h"
extern HMENU g_hPopupMenus;
enum { WM_DEB_GOTOWPARAM = WM_USER+2,
WM_DEB_GOTOADDRESSEDIT,
WM_DEB_MAPLOADED,
@ -16,4 +14,4 @@ enum { WM_DEB_GOTOWPARAM = WM_USER+2,
bool executeExpressionWindow(HWND hwnd, DebugInterface* cpu, u32& dest);
void displayExpressionError(HWND hwnd);
bool parseExpression(const char* exp, DebugInterface* cpu, u32& dest);
bool parseExpression(const char* exp, DebugInterface* cpu, u32& dest);

View file

@ -16,7 +16,13 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Windows/W32Util/ContextMenu.h"
#include "Windows/main.h"
#include "Windows/resource.h"
static HMENU g_hPopupMenus;
void ContextMenuInit(HINSTANCE inst) {
g_hPopupMenus = LoadMenu(inst, (LPCWSTR)IDR_POPUPMENUS);
}
ContextPoint ContextPoint::FromCursor() {
ContextPoint result;

View file

@ -41,5 +41,7 @@ struct ContextPoint {
bool isClient_ = false;
};
void ContextMenuInit(HINSTANCE inst);
HMENU GetContextMenu(ContextMenuID);
int TriggerContextMenu(ContextMenuID which, HWND wnd, const ContextPoint &pt);

View file

@ -65,6 +65,7 @@
#if PPSSPP_API(ANY_GL)
#include "Windows/GEDebugger/GEDebugger.h"
#endif
#include "Windows/W32Util/ContextMenu.h"
#include "Windows/W32Util/DialogManager.h"
#include "Windows/W32Util/ShellUtil.h"
@ -101,7 +102,6 @@ static std::string gpuDriverVersion;
static std::string restartArgs;
HMENU g_hPopupMenus;
int g_activeWindow = 0;
static std::thread inputBoxThread;
@ -665,10 +665,8 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
timeBeginPeriod(1); // TODO: Evaluate if this makes sense to keep.
ContextMenuInit(_hInstance);
MainWindow::Init(_hInstance);
g_hPopupMenus = LoadMenu(_hInstance, (LPCWSTR)IDR_POPUPMENUS);
MainWindow::Show(_hInstance);
HWND hwndMain = MainWindow::GetHWND();

View file

@ -31,7 +31,6 @@ extern CMemoryDlg *memoryWindow;
extern CGEDebugger* geDebuggerWindow;
#endif
extern HMENU g_hPopupMenus;
extern int g_activeWindow;
enum { WINDOW_MAINWINDOW, WINDOW_CPUDEBUGGER, WINDOW_GEDEBUGGER };