summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorleo2002-10-16 07:06:27 +0000
committerleo2002-10-16 07:06:27 +0000
commit5a29323e1747ed2f06e733a9eed5371eb5f4d7f7 (patch)
tree0445c1b026f7b3f8fa9d0d484fc8b72f84420bff /win
parentaac0e540c168a9926cf34ebf02d6df34d0edfa8f (diff)
Making the PLM cross platform.
git-svn-id: http://svn.leocad.org/trunk@315 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'win')
-rw-r--r--win/LeoCAD.dsp17
-rw-r--r--win/System.cpp6
2 files changed, 18 insertions, 5 deletions
diff --git a/win/LeoCAD.dsp b/win/LeoCAD.dsp
index 1be9d04..db37170 100644
--- a/win/LeoCAD.dsp
+++ b/win/LeoCAD.dsp
@@ -1020,6 +1020,10 @@ SOURCE=..\Common\image.h
# End Source File
# Begin Source File
+SOURCE=..\common\libman.h
+# End Source File
+# Begin Source File
+
SOURCE=..\common\library.h
# End Source File
# Begin Source File
@@ -1175,6 +1179,19 @@ SOURCE=..\Common\image.cpp
# End Source File
# Begin Source File
+SOURCE=..\common\libman.cpp
+
+!IF "$(CFG)" == "LeoCAD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\common\library.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
diff --git a/win/System.cpp b/win/System.cpp
index 9c4ce14..bdd5795 100644
--- a/win/System.cpp
+++ b/win/System.cpp
@@ -1331,11 +1331,7 @@ bool SystemDoDialog(int nMode, void* param)
CPiecesBar* pBar = (CPiecesBar*)pFrame->GetControlBar(ID_VIEW_PIECES_BAR);
for (int i = 0; i < pBar->m_wndGroupsBar.m_ToolbarData.iButtons; i++)
- {
- strcpy (dlg.m_strGroups[i], pBar->m_GroupNames[i]);
dlg.m_nBitmaps[i] = pBar->m_wndGroupsBar.m_ToolbarData.ButtonData[i].iBitmap;
- }
- dlg.m_nMaxGroups = pBar->m_wndGroupsBar.m_ToolbarData.iButtons;
dlg.m_ImageList.Create(IDB_PIECEBAR, 16, 0, 0x00ff00ff);
if (dlg.DoModal() == IDOK)
@@ -1347,7 +1343,7 @@ bool SystemDoDialog(int nMode, void* param)
pBar->PostMessage(WM_SIZE, SIZE_RESTORED, MAKELPARAM(rc.right, rc.bottom));
}
- return (dlg.m_bReload != FALSE);
+ return true;
} break;
case LC_DLG_SELECTBYNAME: