summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorleo2006-03-05 23:44:30 +0000
committerleo2006-03-05 23:44:30 +0000
commit5313b0d1b2cf4a803d25faa80b6d7b697f046634 (patch)
tree0bcee3bb32c9819e05deacabcdd19f12b99cdb50 /win
parenta393e0e4f9b7e492e78388565b7c39928564ca0b (diff)
Rewrote the 3D mouse rotation code, removed the 3D mouse option.
git-svn-id: http://svn.leocad.org/trunk@515 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'win')
-rw-r--r--win/Prefpage.cpp6
-rw-r--r--win/Prefpage.h1
-rw-r--r--win/System.cpp5
3 files changed, 0 insertions, 12 deletions
diff --git a/win/Prefpage.cpp b/win/Prefpage.cpp
index f0ff261..72f37fa 100644
--- a/win/Prefpage.cpp
+++ b/win/Prefpage.cpp
@@ -253,7 +253,6 @@ CPreferencesDrawing::CPreferencesDrawing() : CPropertyPage(CPreferencesDrawing::
m_bSnapX = FALSE;
m_bSnapY = FALSE;
m_bSnapZ = FALSE;
- m_b3DMouse = FALSE;
//}}AFX_DATA_INIT
}
@@ -280,7 +279,6 @@ void CPreferencesDrawing::DoDataExchange(CDataExchange* pDX)
DDX_Check(pDX, IDC_AIDDLG_SNAPX, m_bSnapX);
DDX_Check(pDX, IDC_AIDDLG_SNAPY, m_bSnapY);
DDX_Check(pDX, IDC_AIDDLG_SNAPZ, m_bSnapZ);
- DDX_Check(pDX, IDC_AIDDLG_3DMOUSE, m_b3DMouse);
//}}AFX_DATA_MAP
}
@@ -298,7 +296,6 @@ void CPreferencesDrawing::SetOptions(unsigned long dwSnap, unsigned short nAngle
m_bAxis = (dwSnap & LC_DRAW_AXIS) != 0;
m_bCentimeters = (dwSnap & LC_DRAW_CM_UNITS) != 0;
-// m_bCollision = (dwSnap & LC_DRAW_COLLISION) != 0;
m_bFixed = (dwSnap & LC_DRAW_MOVEAXIS) != 0;
m_bGrid = (dwSnap & LC_DRAW_GRID) != 0;
m_bLockX = (dwSnap & LC_DRAW_LOCK_X) != 0;
@@ -309,7 +306,6 @@ void CPreferencesDrawing::SetOptions(unsigned long dwSnap, unsigned short nAngle
m_bSnapX = (dwSnap & LC_DRAW_SNAP_X) != 0;
m_bSnapY = (dwSnap & LC_DRAW_SNAP_Y) != 0;
m_bSnapZ = (dwSnap & LC_DRAW_SNAP_Z) != 0;
- m_b3DMouse = (dwSnap & LC_DRAW_3DMOUSE) != 0;
}
void CPreferencesDrawing::GetOptions(unsigned long* dwSnap, unsigned short* nAngle, unsigned short* nGrid)
@@ -320,7 +316,6 @@ void CPreferencesDrawing::GetOptions(unsigned long* dwSnap, unsigned short* nAng
*dwSnap = 0;
if (m_bAxis) *dwSnap |= LC_DRAW_AXIS;
if (m_bCentimeters) *dwSnap |= LC_DRAW_CM_UNITS;
-// if (m_bCollision) *dwSnap |= LC_DRAW_COLLISION;
if (m_bFixed) *dwSnap |= LC_DRAW_MOVEAXIS;
if (m_bGrid) *dwSnap |= LC_DRAW_GRID;
if (m_bLockX) *dwSnap |= LC_DRAW_LOCK_X;
@@ -331,7 +326,6 @@ void CPreferencesDrawing::GetOptions(unsigned long* dwSnap, unsigned short* nAng
if (m_bSnapX) *dwSnap |= LC_DRAW_SNAP_X;
if (m_bSnapY) *dwSnap |= LC_DRAW_SNAP_Y;
if (m_bSnapZ) *dwSnap |= LC_DRAW_SNAP_Z;
- if (m_b3DMouse) *dwSnap |= LC_DRAW_3DMOUSE;
}
/////////////////////////////////////////////////////////////////////////////
diff --git a/win/Prefpage.h b/win/Prefpage.h
index bf3a6b5..effda4a 100644
--- a/win/Prefpage.h
+++ b/win/Prefpage.h
@@ -140,7 +140,6 @@ public:
BOOL m_bSnapX;
BOOL m_bSnapY;
BOOL m_bSnapZ;
- BOOL m_b3DMouse;
//}}AFX_DATA
diff --git a/win/System.cpp b/win/System.cpp
index 252295a..cd56d3c 100644
--- a/win/System.cpp
+++ b/win/System.cpp
@@ -579,11 +579,6 @@ void SystemUpdateSnap(const unsigned long nSnap)
SetMenuItemBitmaps(pMenu->m_hMenu, ID_LOCK_2BUTTONS, MF_BYCOMMAND, NULL, hbmMenuDot);
SetMenuItemBitmaps(pMenu->m_hMenu, ID_LOCK_3DMOVEMENT, MF_BYCOMMAND, NULL, hbmMenuDot);
- pMenu->CheckMenuItem(ID_LOCK_2BUTTONS, MF_BYCOMMAND |
- ((nSnap & LC_DRAW_3DMOUSE) == 0 ? MF_CHECKED : MF_UNCHECKED));
- pMenu->CheckMenuItem(ID_LOCK_3DMOVEMENT, MF_BYCOMMAND |
- (nSnap & LC_DRAW_3DMOUSE ? MF_CHECKED : MF_UNCHECKED));
-
// TODO: change Snap None & All (or maybe not ?)
}