summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorleo2001-02-02 16:12:30 +0000
committerleo2001-02-02 16:12:30 +0000
commitf1c2824558aeeac94bdd5064fdf8a62b4862b9e9 (patch)
treeee9cd3c42b276463afaa9be93490759e1ed46064 /win
parent52ffe63e27615764eeb7fdb97a206f2b6d1a5368 (diff)
Correctly save HTML dialog options
git-svn-id: http://svn.leocad.org/trunk@240 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'win')
-rw-r--r--win/Htmldlg.cpp12
-rw-r--r--win/Htmldlg.h1
-rw-r--r--win/Imagedlg.cpp24
-rw-r--r--win/Leocad.clw19
4 files changed, 19 insertions, 37 deletions
diff --git a/win/Htmldlg.cpp b/win/Htmldlg.cpp
index 0c9e18a..7e73511 100644
--- a/win/Htmldlg.cpp
+++ b/win/Htmldlg.cpp
@@ -91,15 +91,3 @@ void CHTMLDlg::OnHtmdlgBrowsefolder()
UpdateData (FALSE);
}
}
-
-void CHTMLDlg::OnOK()
-{
- UpdateData();
-
- if (m_strFolder[m_strFolder.GetLength()-1] != '\\')
- m_strFolder += "\\";
-
- UpdateData(FALSE);
-
- CDialog::OnOK();
-}
diff --git a/win/Htmldlg.h b/win/Htmldlg.h
index 4e11678..fb4af17 100644
--- a/win/Htmldlg.h
+++ b/win/Htmldlg.h
@@ -46,7 +46,6 @@ protected:
afx_msg void OnListClick();
afx_msg void OnLayoutClick();
afx_msg void OnHtmdlgBrowsefolder();
- virtual void OnOK();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
diff --git a/win/Imagedlg.cpp b/win/Imagedlg.cpp
index 11b1c67..f2ca2b1 100644
--- a/win/Imagedlg.cpp
+++ b/win/Imagedlg.cpp
@@ -96,22 +96,16 @@ void CImageDlg::OnOK()
opts->to = m_nTo;
opts->multiple = m_nSingle != 0;
- DWORD dwImage = m_nFormat;
- if (m_bProgressive)
- dwImage |= LC_IMAGE_PROGRESSIVE;
- if (m_bTransparent)
- dwImage |= LC_IMAGE_TRANSPARENT;
- if (m_bHighcolor)
- dwImage |= LC_IMAGE_HIGHCOLOR;
-
- if (m_bHTML)
- {
- theApp.WriteProfileInt("Default", "HTML Options", dwImage);
- theApp.WriteProfileInt("Default", "HTML Width", m_nWidth);
- theApp.WriteProfileInt("Default", "HTML Height", m_nHeight);
- }
- else
+ if (!m_bHTML)
{
+ DWORD dwImage = m_nFormat;
+ if (m_bProgressive)
+ dwImage |= LC_IMAGE_PROGRESSIVE;
+ if (m_bTransparent)
+ dwImage |= LC_IMAGE_TRANSPARENT;
+ if (m_bHighcolor)
+ dwImage |= LC_IMAGE_HIGHCOLOR;
+
theApp.WriteProfileInt("Default", "Image Options", dwImage);
theApp.WriteProfileInt("Default", "Image Width", m_nWidth);
theApp.WriteProfileInt("Default", "Image Height", m_nHeight);
diff --git a/win/Leocad.clw b/win/Leocad.clw
index 3852d08..2f88430 100644
--- a/win/Leocad.clw
+++ b/win/Leocad.clw
@@ -130,7 +130,7 @@ HeaderFile=Cadview.h
ImplementationFile=Cadview.cpp
Filter=C
VirtualFilter=VWC
-LastObject=ID_FILE_PRINT_PREVIEW
+LastObject=CCADView
[CLS:CColorPicker]
Type=0
@@ -1095,14 +1095,15 @@ Command72=ID_VIEW_STEP_FIRST
Command73=ID_VIEW_STEP_LAST
Command74=ID_VIEW_STEP_CHOOSE
Command75=ID_VIEW_STEP_INSERT
-Command76=ID_VIEW_FULLSCREEN
-Command77=ID_VIEW_NEWVIEW
-Command78=ID_HELP_FINDER
-Command79=ID_HELP_LEOCADHOMEPAGE
-Command80=ID_HELP_SENDEMAIL
-Command81=ID_HELP_CHECKFORUPDATES
-Command82=ID_APP_ABOUT
-CommandCount=82
+Command76=ID_VIEW_STEP_DELETE
+Command77=ID_VIEW_FULLSCREEN
+Command78=ID_VIEW_NEWVIEW
+Command79=ID_HELP_FINDER
+Command80=ID_HELP_LEOCADHOMEPAGE
+Command81=ID_HELP_SENDEMAIL
+Command82=ID_HELP_CHECKFORUPDATES
+Command83=ID_APP_ABOUT
+CommandCount=83
[MNU:IDR_POPUPS]
Type=1