summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/project.cpp6
-rw-r--r--win/Clrpopup.cpp2
-rw-r--r--win/Leocad.cpp2
-rw-r--r--win/Mainfrm.cpp2
-rw-r--r--win/Mainfrm.h2
-rw-r--r--win/Stdafx.h6
-rw-r--r--win/Steppop.cpp2
-rw-r--r--win/Steppop.h2
-rw-r--r--win/System.cpp2
-rw-r--r--win/aboutdlg.cpp6
-rw-r--r--win/clrpopup.h2
-rw-r--r--win/prevview.cpp5
12 files changed, 26 insertions, 13 deletions
diff --git a/common/project.cpp b/common/project.cpp
index e0b6df2..58460cb 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -7641,11 +7641,11 @@ bool Project::OnKeyDown(char nKey, bool bControl, bool bShift)
axis[0] = axis[1] = xy;
axis[2] = z;
- if ((m_nSnap & LC_DRAW_SNAP_X == 0) || bControl)
+ if (((m_nSnap & LC_DRAW_SNAP_X) == 0) || bControl)
axis[0] = 0.01f;
- if ((m_nSnap & LC_DRAW_SNAP_Y == 0) || bControl)
+ if (((m_nSnap & LC_DRAW_SNAP_Y) == 0) || bControl)
axis[1] = 0.01f;
- if ((m_nSnap & LC_DRAW_SNAP_Z == 0) || bControl)
+ if (((m_nSnap & LC_DRAW_SNAP_Z) == 0) || bControl)
axis[2] = 0.01f;
}
diff --git a/win/Clrpopup.cpp b/win/Clrpopup.cpp
index 41007a8..aa3daa9 100644
--- a/win/Clrpopup.cpp
+++ b/win/Clrpopup.cpp
@@ -829,7 +829,7 @@ void CColorPopup::OnKillFocus(CWnd* pNewWnd)
}
// KillFocus problem fix suggested by Paul Wilkerson.
-void CColorPopup::OnActivateApp(BOOL bActive, HTASK hTask)
+void CColorPopup::OnActivateApp(BOOL bActive, ACTIVATEAPPPARAM hTask)
{
CWnd::OnActivateApp(bActive, hTask);
diff --git a/win/Leocad.cpp b/win/Leocad.cpp
index 51a2635..6dbcce1 100644
--- a/win/Leocad.cpp
+++ b/win/Leocad.cpp
@@ -162,11 +162,13 @@ BOOL CCADApp::InitInstance()
// of your final executable, you should remove from the following
// the specific initialization routines you do not need.
+#if _MFC_VER < 0x0710
#ifdef _AFXDLL
Enable3dControls(); // Call this when using MFC in a shared DLL
#else
Enable3dControlsStatic(); // Call this when linking to MFC statically
#endif
+#endif
SetRegistryKey(_T("BT Software"));
// LoadStdProfileSettings(); // Load standard INI file options (including MRU)
diff --git a/win/Mainfrm.cpp b/win/Mainfrm.cpp
index 416784d..48fa128 100644
--- a/win/Mainfrm.cpp
+++ b/win/Mainfrm.cpp
@@ -1043,7 +1043,7 @@ BOOL CMainFrame::OnCommand(WPARAM wParam, LPARAM lParam)
return TRUE;
}
-void CMainFrame::OnActivateApp(BOOL bActive, HTASK hTask)
+void CMainFrame::OnActivateApp(BOOL bActive, ACTIVATEAPPPARAM hTask)
{
CFrameWnd::OnActivateApp(bActive, hTask);
diff --git a/win/Mainfrm.h b/win/Mainfrm.h
index 4566950..8d1b42e 100644
--- a/win/Mainfrm.h
+++ b/win/Mainfrm.h
@@ -83,7 +83,7 @@ protected:
afx_msg void OnViewFullscreen();
afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
afx_msg void OnFilePrintPieceList();
- afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
+ afx_msg void OnActivateApp(BOOL bActive, ACTIVATEAPPPARAM hTask);
afx_msg void OnViewNewView();
afx_msg LRESULT OnSetMessageString(WPARAM wParam, LPARAM lParam);
afx_msg void OnDropFiles(HDROP hDropInfo);
diff --git a/win/Stdafx.h b/win/Stdafx.h
index ffc6871..1332794 100644
--- a/win/Stdafx.h
+++ b/win/Stdafx.h
@@ -21,6 +21,12 @@
#include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT
+#if _MFC_VER >= 0x0710
+typedef DWORD ACTIVATEAPPPARAM;
+#else
+typedef HTASK ACTIVATEAPPPARAM;
+#endif
+
//#include <afxadv.h> // CSharedFile
#include "opengl.h"
diff --git a/win/Steppop.cpp b/win/Steppop.cpp
index 38b4069..eff6447 100644
--- a/win/Steppop.cpp
+++ b/win/Steppop.cpp
@@ -70,7 +70,7 @@ void CStepPopup::OnKillFocus(CWnd* pNewWnd)
DestroyWindow();
}
-void CStepPopup::OnActivateApp(BOOL bActive, HTASK hTask)
+void CStepPopup::OnActivateApp(BOOL bActive, ACTIVATEAPPPARAM hTask)
{
CWnd::OnActivateApp(bActive, hTask);
diff --git a/win/Steppop.h b/win/Steppop.h
index 12ac62b..eab2b6e 100644
--- a/win/Steppop.h
+++ b/win/Steppop.h
@@ -38,7 +38,7 @@ protected:
//{{AFX_MSG(CStepPopup)
afx_msg void OnNcDestroy();
afx_msg void OnKillFocus(CWnd* pNewWnd);
- afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
+ afx_msg void OnActivateApp(BOOL bActive, ACTIVATEAPPPARAM hTask);
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
//}}AFX_MSG
diff --git a/win/System.cpp b/win/System.cpp
index aa2a267..285cafc 100644
--- a/win/System.cpp
+++ b/win/System.cpp
@@ -859,7 +859,7 @@ static void AbbreviateName(LPTSTR lpszCanon, int cchMax, BOOL bAtLeastName)
// If cchMax isn't enough to hold at least the basename, we're done
if (cchMax < cchFileName)
{
- lstrcpy(lpszCanon, (bAtLeastName) ? lpszFileName : &afxChNil);
+ lstrcpy(lpszCanon, (bAtLeastName) ? lpszFileName : _T(""));
return;
}
diff --git a/win/aboutdlg.cpp b/win/aboutdlg.cpp
index 0d64b90..1c261ea 100644
--- a/win/aboutdlg.cpp
+++ b/win/aboutdlg.cpp
@@ -75,11 +75,11 @@ BOOL CAboutDlg::OnInitDialog()
tmp.Format("Color bits: %d, Depth Buffer: %d bits\r\nOpenGL Version ", pfd.cColorBits, pfd.cDepthBits);
info += tmp;
- info += glGetString(GL_VERSION);
+ info += (const char*)glGetString(GL_VERSION);
info += " (";
- info += glGetString(GL_RENDERER);
+ info += (const char*)glGetString(GL_RENDERER);
info += " - ";
- info += glGetString(GL_VENDOR);
+ info += (const char*)glGetString(GL_VENDOR);
info += ")";
SetDlgItemText(IDC_ABTDLG_INFO, info);
diff --git a/win/clrpopup.h b/win/clrpopup.h
index 66d058b..591ef35 100644
--- a/win/clrpopup.h
+++ b/win/clrpopup.h
@@ -84,7 +84,7 @@ protected:
afx_msg BOOL OnQueryNewPalette();
afx_msg void OnPaletteChanged(CWnd* pFocusWnd);
afx_msg void OnKillFocus(CWnd* pNewWnd);
- afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
+ afx_msg void OnActivateApp(BOOL bActive, ACTIVATEAPPPARAM hTask);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
diff --git a/win/prevview.cpp b/win/prevview.cpp
index 57d5e17..798c132 100644
--- a/win/prevview.cpp
+++ b/win/prevview.cpp
@@ -7,7 +7,12 @@
#include "PrevView.h"
#include "CADView.h"
+
+#if _MFC_VER < 0x0710
#include <../src/afximpl.h>
+#else
+#include <../src/mfc/afximpl.h>
+#endif
#ifdef _DEBUG
#undef THIS_FILE