summaryrefslogtreecommitdiffhomepage
path: root/Magic2/MainFrm.h
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.h
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.h')
-rw-r--r--Magic2/MainFrm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Magic2/MainFrm.h b/Magic2/MainFrm.h
index f7de5db..8d51197 100644
--- a/Magic2/MainFrm.h
+++ b/Magic2/MainFrm.h
@@ -48,7 +48,7 @@ protected: // control bar embedded members
protected:
//{{AFX_MSG(MainFrame)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
- afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
+ afx_msg void OnActivateApp(BOOL bActive, DWORD dwThreadID);
afx_msg void OnRender();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()