summaryrefslogtreecommitdiffhomepage
path: root/Magic2/MainFrm.cpp
diff options
context:
space:
mode:
authorFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-05-26 16:38:08 +0000
committerFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-05-26 16:38:08 +0000
commit9a9de7689176de013872e5a6a5367f79202d0844 (patch)
treeaaf098cfd51175b9e1d675fd21373d0c3de5ef8d /Magic2/MainFrm.cpp
parent75f9af66439ec416634188eb3ef020df4e4752b7 (diff)
downloadstarshatter-9a9de7689176de013872e5a6a5367f79202d0844.zip
starshatter-9a9de7689176de013872e5a6a5367f79202d0844.tar.gz
starshatter-9a9de7689176de013872e5a6a5367f79202d0844.tar.bz2
Getting closer to getting magic to compile. The file renaming was necessary in order to remove a conflict between the WinSDK's locale.h and starshatter's own version.
Diffstat (limited to 'Magic2/MainFrm.cpp')
-rw-r--r--Magic2/MainFrm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Magic2/MainFrm.cpp b/Magic2/MainFrm.cpp
index 9cc2193..97ee18b 100644
--- a/Magic2/MainFrm.cpp
+++ b/Magic2/MainFrm.cpp
@@ -139,7 +139,7 @@ void MainFrame::Dump(CDumpContext& dc) const
// MainFrame message handlers
-void MainFrame::OnActivateApp(BOOL bActive, HTASK hTask)
+void MainFrame::OnActivateApp(BOOL bActive, DWORD dwThreadID)
{
((Magic*)AfxGetApp())->SetAppActivated(bActive ? true : false);
}