summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2000-11-15 01:15:44 +0000
committerleo2000-11-15 01:15:44 +0000
commitec77f06c40c9e0986e82096105bd9f90d0c4a46b (patch)
treea1525efd71e320762fb65e8d09c9c4b0c54f11fe
parent87ab0616848f9f7bd8ac864a9892442784e30b0f (diff)
changes to catch up with the new features fo the linux version
git-svn-id: http://svn.leocad.org/trunk@162 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--win/Figdlg.cpp37
-rw-r--r--win/Figdlg.h1
-rw-r--r--win/LeoCAD.dsp33
-rw-r--r--win/LeoCAD.rc114
-rw-r--r--win/Leocad.cpp7
-rw-r--r--win/Libdlg.cpp40
-rw-r--r--win/Mainfrm.cpp23
-rw-r--r--win/System.cpp27
-rw-r--r--win/config.h22
-rw-r--r--win/resource.h30
10 files changed, 268 insertions, 66 deletions
diff --git a/win/Figdlg.cpp b/win/Figdlg.cpp
index 27baa93..9ab19e8 100644
--- a/win/Figdlg.cpp
+++ b/win/Figdlg.cpp
@@ -54,6 +54,7 @@ BEGIN_MESSAGE_MAP(CMinifigDlg, CDialog)
//}}AFX_MSG_MAP
ON_MESSAGE(CPN_SELENDOK, OnColorSelEndOK)
ON_CONTROL_RANGE(CBN_SELENDOK, IDC_MF_HAT, IDC_MF_SHOER, OnPieceSelEndOK)
+ ON_CONTROL_RANGE(EN_CHANGE, IDC_MF_HATANGLE, IDC_MF_SHOERANGLE, OnChangeAngle)
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@@ -89,17 +90,21 @@ BOOL CMinifigDlg::OnInitDialog()
for (j = 0; j < count; j++)
pCombo->AddString (names[j]);
free (names);
-
- if (i == 6) i++;
}
- for (i = IDC_MF_NECK; i <= IDC_MF_SHOER; i++)
- ((CComboBox*)GetDlgItem(i))->SetCurSel(0);
- ((CComboBox*)GetDlgItem(IDC_MF_HAT))->SetCurSel(6);
- ((CComboBox*)GetDlgItem(IDC_MF_HEAD))->SetCurSel(4);
- ((CComboBox*)GetDlgItem(IDC_MF_TORSO))->SetCurSel(18);
+ char *names[LC_MFW_NUMITEMS];
+ m_pMFWnd->m_pFig->GetSelections (names);
+
+ for (i = 0; i < LC_MFW_NUMITEMS; i++)
+ {
+ CComboBox* pCombo = (CComboBox*)GetDlgItem(i+IDC_MF_HAT);
+ pCombo->SetCurSel (pCombo->FindString (-1, names[i]));
+ }
+
+ for (i = IDC_MF_HATSPIN; i <= IDC_MF_SHOERSPIN; i++)
+ ((CSpinButtonCtrl*)GetDlgItem(i))->SetRange(-360, 360);
- return TRUE; // return TRUE unless you set the focus to a control
+ return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
@@ -123,7 +128,21 @@ void CMinifigDlg::OnPieceSelEndOK(UINT nID)
{
char tmp[65];
GetDlgItem(nID)->GetWindowText (tmp, 65);
-
m_pMFWnd->m_pFig->ChangePiece (nID-IDC_MF_HAT, tmp);
m_pMFWnd->PostMessage(WM_PAINT);
}
+
+void CMinifigDlg::OnChangeAngle(UINT nID)
+{
+ char tmp[65];
+ GetDlgItem(nID)->GetWindowText (tmp, 65);
+ if (m_pMFWnd)
+ {
+ int index[] = { LC_MFW_HAT, LC_MFW_HEAD, LC_MFW_NECK,
+ LC_MFW_LEFT_ARM, LC_MFW_RIGHT_ARM, LC_MFW_LEFT_HAND,
+ LC_MFW_RIGHT_HAND, LC_MFW_LEFT_TOOL, LC_MFW_RIGHT_TOOL,
+ LC_MFW_LEFT_LEG, LC_MFW_RIGHT_LEG, LC_MFW_LEFT_SHOE, LC_MFW_RIGHT_SHOE };
+ m_pMFWnd->m_pFig->ChangeAngle (index[nID-IDC_MF_HATANGLE], (float)strtod (tmp, NULL));
+ m_pMFWnd->PostMessage(WM_PAINT);
+ }
+}
diff --git a/win/Figdlg.h b/win/Figdlg.h
index b92583f..221f2a7 100644
--- a/win/Figdlg.h
+++ b/win/Figdlg.h
@@ -56,6 +56,7 @@ protected:
afx_msg LONG OnColorSelEndOK(UINT lParam, LONG wParam);
void OnPieceSelEndOK(UINT nID);
+ void OnChangeAngle(UINT nID);
// Generated message map functions
//{{AFX_MSG(CMinifigDlg)
diff --git a/win/LeoCAD.dsp b/win/LeoCAD.dsp
index b4ab015..462c005 100644
--- a/win/LeoCAD.dsp
+++ b/win/LeoCAD.dsp
@@ -365,6 +365,10 @@ SOURCE=.\ColorLst.h
# End Source File
# Begin Source File
+SOURCE=.\Config.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Disabtab.h
# End Source File
# Begin Source File
@@ -974,6 +978,18 @@ SOURCE=..\common\im_bmp.cpp
# End Source File
# Begin Source File
+SOURCE=..\common\im_gif.cpp
+# ADD CPP /I "./jpeglib"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\im_jpg.cpp
+# ADD CPP /I "./jpeglib"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
SOURCE=..\common\im_png.cpp
# ADD CPP /I "./libpng" /I "./zlib"
# SUBTRACT CPP /YX /Yc /Yu
@@ -1017,6 +1033,23 @@ SOURCE=..\Common\matrix.h
# End Source File
# Begin Source File
+SOURCE=..\common\message.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\message.h
+# End Source File
+# Begin Source File
+
SOURCE=..\common\minifig.cpp
!IF "$(CFG)" == "LeoCAD - Win32 Release"
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index a9ea831..12a4dca 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -806,59 +806,119 @@ BEGIN
PUSHBUTTON "Apply",IDAPPLY,71,28,35,11
END
-IDD_MINIFIG DIALOG DISCARDABLE 0, 0, 300, 185
+IDD_MINIFIG DIALOG DISCARDABLE 0, 0, 360, 185
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Minifig Wizard"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "OK",IDOK,204,164,41,14
- PUSHBUTTON "Cancel",IDCANCEL,253,164,41,14
+ DEFPUSHBUTTON "OK",IDOK,264,164,41,14
+ PUSHBUTTON "Cancel",IDCANCEL,313,164,41,14
COMBOBOX IDC_MF_HAT,7,11,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_HATCOLOR,76,11,22,12
+ PUSHBUTTON "",IDC_MF_HATCOLOR,75,11,22,12
+ EDITTEXT IDC_MF_HATANGLE,100,12,20,10,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "Spin1",IDC_MF_HATSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,122,11,7,
+ 12
COMBOBOX IDC_MF_NECK,7,30,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_NECKCOLOR,76,30,22,12
+ PUSHBUTTON "",IDC_MF_NECKCOLOR,75,30,22,12
+ EDITTEXT IDC_MF_NECKANGLE,100,31,20,10,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "Spin1",IDC_MF_NECKSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,122,30,8,
+ 12
COMBOBOX IDC_MF_ARMR,7,49,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_ARMRCOLOR,76,49,22,12
+ PUSHBUTTON "",IDC_MF_ARMRCOLOR,75,49,22,12
+ EDITTEXT IDC_MF_ARMRANGLE,100,50,20,10,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "Spin1",IDC_MF_ARMRSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,122,49,8,
+ 12
COMBOBOX IDC_MF_HANDR,7,68,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_HANDRCOLOR,76,68,22,12
+ PUSHBUTTON "",IDC_MF_HANDRCOLOR,75,68,22,12
+ EDITTEXT IDC_MF_HANDRANGLE,100,69,20,10,ES_AUTOHSCROLL |
+ ES_NUMBER
+ CONTROL "Spin1",IDC_MF_HANDRSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,122,68,8,
+ 12
COMBOBOX IDC_MF_TOOLR,7,87,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_TOOLRCOLOR,76,87,22,12
+ PUSHBUTTON "",IDC_MF_TOOLRCOLOR,75,87,22,12
+ EDITTEXT IDC_MF_TOOLRANGLE,100,88,20,10,ES_AUTOHSCROLL |
+ ES_NUMBER
+ CONTROL "Spin1",IDC_MF_TOOLRSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,122,87,8,
+ 12
COMBOBOX IDC_MF_HIPS,7,106,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_HIPSCOLOR,76,106,22,12
+ PUSHBUTTON "",IDC_MF_HIPSCOLOR,75,106,22,12
COMBOBOX IDC_MF_LEGR,7,125,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_LEGRCOLOR,76,125,22,12
+ PUSHBUTTON "",IDC_MF_LEGRCOLOR,75,125,22,12
+ EDITTEXT IDC_MF_LEGRANGLE,100,126,20,10,ES_AUTOHSCROLL |
+ ES_NUMBER
+ CONTROL "Spin1",IDC_MF_LEGRSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,122,125,
+ 8,12
COMBOBOX IDC_MF_SHOER,7,144,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_SHOERCOLOR,76,144,22,12
- PUSHBUTTON "",IDC_MF_HEADCOLOR,202,18,22,12
- COMBOBOX IDC_MF_HEAD,228,18,65,66,CBS_DROPDOWNLIST | CBS_SORT |
+ PUSHBUTTON "",IDC_MF_SHOERCOLOR,75,144,22,12
+ EDITTEXT IDC_MF_SHOERANGLE,100,145,20,10,ES_AUTOHSCROLL |
+ ES_NUMBER
+ CONTROL "Spin1",IDC_MF_SHOERSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,122,144,
+ 8,12
+ EDITTEXT IDC_MF_HEADANGLE,230,19,20,10,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "Spin1",IDC_MF_HEADSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,252,18,7,
+ 12
+ PUSHBUTTON "",IDC_MF_HEADCOLOR,263,18,22,12
+ COMBOBOX IDC_MF_HEAD,288,18,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_TORSOCOLOR,202,36,22,12
- COMBOBOX IDC_MF_TORSO,228,36,65,66,CBS_DROPDOWNLIST | CBS_SORT |
+ PUSHBUTTON "",IDC_MF_TORSOCOLOR,263,36,22,12
+ COMBOBOX IDC_MF_TORSO,288,36,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_ARMLCOLOR,202,54,22,12
- COMBOBOX IDC_MF_ARML,228,54,65,66,CBS_DROPDOWNLIST | CBS_SORT |
+ EDITTEXT IDC_MF_ARMLANGLE,230,55,20,10,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "Spin1",IDC_MF_ARMLSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,252,54,8,
+ 12
+ PUSHBUTTON "",IDC_MF_ARMLCOLOR,263,54,22,12
+ COMBOBOX IDC_MF_ARML,288,54,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_HANDLCOLOR,202,72,22,12
- COMBOBOX IDC_MF_HANDL,228,72,65,66,CBS_DROPDOWNLIST | CBS_SORT |
+ EDITTEXT IDC_MF_HANDLANGLE,230,73,20,10,ES_AUTOHSCROLL |
+ ES_NUMBER
+ CONTROL "Spin1",IDC_MF_HANDLSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,252,72,8,
+ 12
+ PUSHBUTTON "",IDC_MF_HANDLCOLOR,263,72,22,12
+ COMBOBOX IDC_MF_HANDL,288,72,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_TOOLLCOLOR,202,90,22,12
- COMBOBOX IDC_MF_TOOLL,228,90,65,66,CBS_DROPDOWNLIST | CBS_SORT |
+ EDITTEXT IDC_MF_TOOLLANGLE,230,91,20,10,ES_AUTOHSCROLL |
+ ES_NUMBER
+ CONTROL "Spin1",IDC_MF_TOOLLSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,252,90,8,
+ 12
+ PUSHBUTTON "",IDC_MF_TOOLLCOLOR,263,90,22,12
+ COMBOBOX IDC_MF_TOOLL,288,90,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_LEGLCOLOR,202,126,22,12
- COMBOBOX IDC_MF_LEGL,228,126,65,66,CBS_DROPDOWNLIST | CBS_SORT |
+ EDITTEXT IDC_MF_LEGLANGLE,230,127,20,10,ES_AUTOHSCROLL |
+ ES_NUMBER
+ CONTROL "Spin1",IDC_MF_LEGLSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,252,126,
+ 8,12
+ PUSHBUTTON "",IDC_MF_LEGLCOLOR,263,126,22,12
+ COMBOBOX IDC_MF_LEGL,288,126,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "",IDC_MF_SHOELCOLOR,202,144,22,12
- COMBOBOX IDC_MF_SHOEL,228,144,65,66,CBS_DROPDOWNLIST | CBS_SORT |
+ EDITTEXT IDC_MF_SHOELANGLE,230,145,20,10,ES_AUTOHSCROLL |
+ ES_NUMBER
+ CONTROL "Spin1",IDC_MF_SHOELSPIN,"msctls_updown32",UDS_WRAP |
+ UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,252,144,
+ 8,12
+ PUSHBUTTON "",IDC_MF_SHOELCOLOR,263,144,22,12
+ COMBOBOX IDC_MF_SHOEL,288,144,65,66,CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
- LTEXT "",IDC_PREVIEWSTATIC,102,7,96,158,NOT WS_VISIBLE | NOT
+ LTEXT "",IDC_PREVIEWSTATIC,132,7,96,158,NOT WS_VISIBLE | NOT
WS_GROUP
END
@@ -1427,7 +1487,7 @@ BEGIN
IDD_MINIFIG, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 293
+ RIGHTMARGIN, 353
TOPMARGIN, 7
BOTTOMMARGIN, 178
END
diff --git a/win/Leocad.cpp b/win/Leocad.cpp
index f792a43..66c45e1 100644
--- a/win/Leocad.cpp
+++ b/win/Leocad.cpp
@@ -12,6 +12,7 @@
#include "globals.h"
#include "system.h"
#include "pieceinf.h" // TODO: remove
+#include "config.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -91,12 +92,14 @@ BOOL CCADApp::InitInstance()
SetRegistryKey(_T("BT Software"));
// LoadStdProfileSettings(); // Load standard INI file options (including MRU)
+
if (!GL_Initialize (NULL))
+
return FALSE;
+
// Register the application's document templates. Document templates
// serve as the connection between documents, frame windows and views.
-
CSingleDocTemplate* pDocTemplate;
pDocTemplate = new CSingleDocTemplate(
IDR_MAINFRAME,
@@ -296,7 +299,7 @@ void CCADApp::OnHelpUpdates()
{
CString str;
- if (ver > LC_APP_VERSION)
+ if (ver > LC_VERSION_MAJOR + (float)LC_VERSION_MINOR/100)
str.Format("There's a new version (%0.2f) on the home page.\n", ver);
else
str = "You are using the latest version of the program.\n";
diff --git a/win/Libdlg.cpp b/win/Libdlg.cpp
index 23974b1..1feba79 100644
--- a/win/Libdlg.cpp
+++ b/win/Libdlg.cpp
@@ -306,32 +306,38 @@ BOOL CLibraryDlg::OnCommand(WPARAM wParam, LPARAM lParam)
CString filename;
LC_LDRAW_PIECE piece;
- CFileDialog dlg(TRUE, ".dat\0", NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
+ CFileDialog dlg(TRUE, ".dat\0", NULL,OFN_ALLOWMULTISELECT | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
"LDraw Files (*.dat)|*.dat|All Files (*.*)|*.*||",this);
dlg.m_ofn.lpstrFile = filename.GetBuffer(_MAX_PATH);
+ dlg.m_ofn.nMaxFile = _MAX_PATH;
- if (dlg.DoModal() != IDOK)
+ if (dlg.DoModal() != IDOK)
return TRUE;
- filename.ReleaseBuffer();
- SystemDoWaitCursor(1);
+ POSITION pos = dlg.GetStartPosition ();
- if (ReadLDrawPiece(filename, &piece))
- {
- if (project->FindPieceInfo(piece.name) != NULL)
- AfxMessageBox("Piece already exists in the library !", MB_OK|MB_ICONINFORMATION);
+ while (pos != NULL)
+ {
+ CString str = dlg.GetNextPathName (pos);
- if (SaveLDrawPiece(&piece))
- AfxMessageBox("Piece successfully imported.", MB_OK|MB_ICONINFORMATION);
- else
- AfxMessageBox("Error saving library.", MB_OK|MB_ICONINFORMATION);
- }
- else
- AfxMessageBox("Error reading file", MB_OK|MB_ICONINFORMATION);
+ SystemDoWaitCursor(1);
+
+ if (ReadLDrawPiece(str, &piece))
+ {
+ if (project->FindPieceInfo(piece.name) != NULL)
+ AfxMessageBox("Piece already exists in the library !", MB_OK|MB_ICONINFORMATION);
- SystemDoWaitCursor(-1);
- FreeLDrawPiece(&piece);
+ if (SaveLDrawPiece(&piece))
+ AfxMessageBox("Piece successfully imported.", MB_OK|MB_ICONINFORMATION);
+ else
+ AfxMessageBox("Error saving library.", MB_OK|MB_ICONINFORMATION);
+ }
+ else
+ AfxMessageBox("Error reading file", MB_OK|MB_ICONINFORMATION);
+ SystemDoWaitCursor(-1);
+ FreeLDrawPiece(&piece);
+ }
return TRUE;
}
diff --git a/win/Mainfrm.cpp b/win/Mainfrm.cpp
index 35f92cf..e49d8d2 100644
--- a/win/Mainfrm.cpp
+++ b/win/Mainfrm.cpp
@@ -6,6 +6,7 @@
#include "MainFrm.h"
#include "Camera.h"
#include "project.h"
+#include "message.h"
#include "globals.h"
#include "Print.h"
@@ -18,6 +19,26 @@ static char THIS_FILE[] = __FILE__;
#define TOOLBAR_VERSION 1
+/*
+// if (type == 255) -> don't change current type
+void SystemUpdateFocus(void* object, unsigned char type)
+{
+ CWnd* pFrame = AfxGetMainWnd();
+ if (pFrame != NULL)
+ pFrame->PostMessage(WM_LC_UPDATE_INFO, (WPARAM)object, type);
+}
+*/
+
+void mainframe_listener (int message, void *data, void *user)
+{
+ if (message == LC_MSG_FOCUS_CHANGED)
+ {
+ CWnd* pFrame = AfxGetMainWnd();
+ if (pFrame != NULL)
+ pFrame->PostMessage(WM_LC_UPDATE_INFO, (WPARAM)data, 0);
+ }
+}
+
/////////////////////////////////////////////////////////////////////////////
// CMainFrame
@@ -178,6 +199,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
SetMenu (pMenu);
m_hMenuDefault = hMenu;
+ messenger->Listen (&mainframe_listener, this);
+
return 0;
}
diff --git a/win/System.cpp b/win/System.cpp
index d3d6e23..3dbd7fc 100644
--- a/win/System.cpp
+++ b/win/System.cpp
@@ -309,15 +309,25 @@ void SystemDoWaitCursor(int nCode)
}
void Sys_BeginWait ()
+
{
+
SystemDoWaitCursor (1);
+
}
+
+
void Sys_EndWait ()
+
{
+
SystemDoWaitCursor (-1);
+
}
+
+
/////////////////////////////////////////////////////////////////////////////
// Profile Access
@@ -1030,10 +1040,15 @@ int SystemDoMessageBox(char* prompt, int nMode)
}
int Sys_MessageBox (const char* text, const char* caption, int type)
+
{
+
return AfxMessageBox(text, type);
+
}
+
+
extern BOOL AFXAPI AfxFullPath(LPTSTR lpszPathOut, LPCTSTR lpszFileIn);
bool SystemDoDialog(int nMode, void* param)
@@ -1479,14 +1494,6 @@ void SystemReleaseMouse()
ReleaseCapture();
}
-// if (type == 255) -> don't change current type
-void SystemUpdateFocus(void* object, unsigned char type)
-{
- CWnd* pFrame = AfxGetMainWnd();
- if (pFrame != NULL)
- pFrame->PostMessage(WM_LC_UPDATE_INFO, (WPARAM)object, type);
-}
-
void SystemExportClipboard(File* clip)
{
if (clip == NULL)
@@ -1539,10 +1546,12 @@ bool Sys_KeyDown (int key)
return GetKeyState (KEY_CONTROL) < 0;
}
+
void SystemPumpMessages()
{
MSG msg;
- while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+
+ while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
{
TranslateMessage(&msg);
DispatchMessage(&msg);
diff --git a/win/config.h b/win/config.h
new file mode 100644
index 0000000..642309f
--- /dev/null
+++ b/win/config.h
@@ -0,0 +1,22 @@
+//
+// LeoCAD configuration
+//
+// Auto-generated file, DO NOT EDIT
+//
+
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+#define LC_VERSION_MAJOR 0
+#define LC_VERSION_MINOR 72
+#define LC_VERSION_PATCH 0
+#define LC_VERSION_OSNAME "Windows"
+#define LC_VERSION "0.72.0"
+#define LC_INSTALL_PREFIX "C:\\leocad"
+
+#define LC_LITTLE_ENDIAN
+#define LC_HAVE_JPEGLIB
+#define LC_HAVE_ZLIB
+#define LC_HAVE_PNGLIB
+
+#endif // _CONFIG_H_
diff --git a/win/resource.h b/win/resource.h
index d17b9f8..cc3bdc3 100644
--- a/win/resource.h
+++ b/win/resource.h
@@ -390,7 +390,33 @@
#define IDC_MF_LEGR 1216
#define IDC_MF_SHOEL 1217
#define IDC_MF_SHOER 1218
-#define IDC_PREVIEWSTATIC 1220
+#define IDC_PREVIEWSTATIC 1219
+#define IDC_MF_HATANGLE 1220
+#define IDC_MF_HEADANGLE 1221
+#define IDC_MF_NECKANGLE 1222
+#define IDC_MF_ARMLANGLE 1223
+#define IDC_MF_ARMRANGLE 1224
+#define IDC_MF_HANDLANGLE 1225
+#define IDC_MF_HANDRANGLE 1226
+#define IDC_MF_TOOLLANGLE 1227
+#define IDC_MF_TOOLRANGLE 1228
+#define IDC_MF_LEGLANGLE 1229
+#define IDC_MF_LEGRANGLE 1230
+#define IDC_MF_SHOELANGLE 1231
+#define IDC_MF_SHOERANGLE 1232
+#define IDC_MF_HATSPIN 1233
+#define IDC_MF_HEADSPIN 1234
+#define IDC_MF_NECKSPIN 1235
+#define IDC_MF_ARMLSPIN 1236
+#define IDC_MF_ARMRSPIN 1237
+#define IDC_MF_HANDLSPIN 1238
+#define IDC_MF_HANDRSPIN 1239
+#define IDC_MF_TOOLLSPIN 1240
+#define IDC_MF_TOOLRSPIN 1241
+#define IDC_MF_LEGLSPIN 1242
+#define IDC_MF_LEGRSPIN 1243
+#define IDC_MF_SHOELSPIN 1244
+#define IDC_MF_SHOERSPIN 1245
#define ID_EDIT_SELECTALL 32772
#define ID_EDIT_SELECTNONE 32773
#define ID_EDIT_SELECTINVERT 32774
@@ -621,7 +647,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 234
#define _APS_NEXT_COMMAND_VALUE 33153
-#define _APS_NEXT_CONTROL_VALUE 1216
+#define _APS_NEXT_CONTROL_VALUE 1223
#define _APS_NEXT_SYMED_VALUE 121
#endif
#endif