Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 20:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] fix the bug that Toolbar is not working

Browse source
This commit is contained in:
赫杨 2020-08-03 21:54:01 +08:00 • committed by Mark Jansen
parent 36870a02f7
commit d29fba7f7a
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

64
base/applications/rapps/appview.cpp
View file

@ -1784,6 +1784,7 @@ VOID CApplicationView::OnCommand(WPARAM wParam, LPARAM lParam)
break; break;
} }
return;
} }
else if ((HWND)lParam == m_ComboBox->GetWindow()) else if ((HWND)lParam == m_ComboBox->GetWindow())
{ {
@ -1801,42 +1802,51 @@ VOID CApplicationView::OnCommand(WPARAM wParam, LPARAM lParam)
} }
break; break;
} }
return;
}
else if ((HWND)lParam == m_Toolbar->GetWindow())
{
// the message is sent from Toolbar. fall down to continue process
}
else
{
return;
} }
} }
else
// the LOWORD of wParam contains a Menu or Control ID
WORD wCommand = LOWORD(wParam);
switch (wCommand)
{ {
WORD wCommand = LOWORD(wParam); case ID_INSTALL:
m_MainWindow->InstallApplication((CAvailableApplicationInfo *)GetFocusedItemData());
break;
switch (wCommand) case ID_TOOLBAR_INSTALL:
{ m_MainWindow->SendMessageW(WM_COMMAND, ID_INSTALL, 0);
case ID_INSTALL: break;
m_MainWindow->InstallApplication((CAvailableApplicationInfo *)GetFocusedItemData());
break;
case ID_TOOLBAR_INSTALL: case ID_UNINSTALL:
m_MainWindow->SendMessageW(WM_COMMAND, ID_INSTALL, 0); m_MainWindow->SendMessageW(WM_COMMAND, ID_UNINSTALL, 0);
break; break;
case ID_UNINSTALL: case ID_MODIFY:
m_MainWindow->SendMessageW(WM_COMMAND, ID_UNINSTALL, 0); m_MainWindow->SendMessageW(WM_COMMAND, ID_MODIFY, 0);
break; break;
case ID_MODIFY: case ID_REGREMOVE:
m_MainWindow->SendMessageW(WM_COMMAND, ID_MODIFY, 0); m_MainWindow->SendMessageW(WM_COMMAND, ID_REGREMOVE, 0);
break; break;
case ID_REGREMOVE: case ID_REFRESH:
m_MainWindow->SendMessageW(WM_COMMAND, ID_REGREMOVE, 0); m_MainWindow->SendMessageW(WM_COMMAND, ID_REFRESH, 0);
break; break;
case ID_REFRESH: case ID_RESETDB:
m_MainWindow->SendMessageW(WM_COMMAND, ID_REFRESH, 0); m_MainWindow->SendMessageW(WM_COMMAND, ID_RESETDB, 0);
break; break;
case ID_RESETDB:
m_MainWindow->SendMessageW(WM_COMMAND, ID_RESETDB, 0);
break;
}
} }
} }