Skip to content

Commit

Permalink
_final_ final cleanup for review
Browse files Browse the repository at this point in the history
  • Loading branch information
zadjii-msft committed Dec 17, 2020
1 parent b4fe1bf commit d08e65c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 27 deletions.
1 change: 1 addition & 0 deletions .github/actions/spell-check/dictionary/apis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ IExplorer
IInheritable
IMap
IObject
IPeasant
IStorage
ITab
ITaskbar
Expand Down
2 changes: 1 addition & 1 deletion build/Helix/runtests.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ echo %TIME%
powershell -ExecutionPolicy Bypass .\InstallTestAppDependencies.ps1
echo %TIME%

set testBinaryCandidates=TerminalApp.LocalTests.dll SettingsModel.LocalTests.dll Remoting.LocalTests.dll Conhost.UIA.Tests.dll
set testBinaryCandidates=TerminalApp.LocalTests.dll SettingsModel.LocalTests.dll Conhost.UIA.Tests.dll
set testBinaries=
for %%B in (%testBinaryCandidates%) do (
if exist %%B (
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/Remoting/CommandlineArgs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
{
// If you try to move this into the header, you will experience P A I N
// It must be defined after CommandlineArgs.g.cpp, otherwise the compiler
// will give you just the most impossible tmplate errors to try and
// will give you just the most impossible template errors to try and
// decipher.
void CommandlineArgs::Args(winrt::array_view<const winrt::hstring> const& value)
{
Expand Down
21 changes: 1 addition & 20 deletions src/cascadia/WindowsTerminal/AppHost.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -517,26 +517,7 @@ bool AppHost::HasWindow()
return _shouldCreateWindow;
}

// void AppHost::_RegisterAsMonarch()
// {
// winrt::check_hresult(CoRegisterClassObject(Monarch_clsid,
// winrt::make<::MonarchFactory>().get(),
// CLSCTX_LOCAL_SERVER,
// REGCLS_MULTIPLEUSE,
// &_registrationHostClass));
// }

// void AppHost::_CreateMonarch()
// {
// }

// bool AppHost::_ProposeCommandlineToMonarch()
// {
// // returns true if we should create a new window
// return true;
// }

void AppHost::_DispatchCommandline(winrt::Windows::Foundation::IInspectable sender,
void AppHost::_DispatchCommandline(winrt::Windows::Foundation::IInspectable /*sender*/,
winrt::Microsoft::Terminal::Remoting::CommandlineArgs args)
{
_logic.ExecuteCommandline(args.Args());
Expand Down
5 changes: 0 additions & 5 deletions src/cascadia/WindowsTerminal/AppHost.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class AppHost
winrt::TerminalApp::App _app;
winrt::TerminalApp::AppLogic _logic;
bool _shouldCreateWindow{ false };
// DWORD _registrationHostClass{ 0 };
winrt::Microsoft::Terminal::Remoting::WindowManager _windowManager{ nullptr };

void _HandleCommandlineArgs();
Expand All @@ -46,10 +45,6 @@ class AppHost
const winrt::Windows::Foundation::IInspectable& arg);
void _WindowMouseWheeled(const til::point coord, const int32_t delta);

// void _RegisterAsMonarch();
// void _CreateMonarch();
// bool _ProposeCommandlineToMonarch();

void _DispatchCommandline(winrt::Windows::Foundation::IInspectable sender,
winrt::Microsoft::Terminal::Remoting::CommandlineArgs args);
};

1 comment on commit d08e65c

@github-actions

This comment was marked as outdated.

Please sign in to comment.