Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Compilation with 64 bits MFC

Browse source
This commit is contained in:
kervala 2012-10-28 12:22:30 +01:00
parent b7be696848
commit 34bf41082f
18 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp
View file

@ -96,12 +96,12 @@
//#define VMAP_DEBUG 1 //#define VMAP_DEBUG 1
// Forward references // Forward references
BOOL CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
void ResetVert (PatchMesh *patch); void ResetVert (PatchMesh *patch);

12
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP.cpp
View file

@ -96,12 +96,12 @@
//#define VMAP_DEBUG 1 //#define VMAP_DEBUG 1
// Forward references // Forward references
BOOL CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
void ResetVert (PatchMesh *patch); void ResetVert (PatchMesh *patch);

6
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_EPM_Selection.cpp
View file

@ -9,9 +9,9 @@
#define PROMPT_TIME 2000 #define PROMPT_TIME 2000
BOOL CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
extern void ChangePatchType(PatchMesh *patch, int index, int type); extern void ChangePatchType(PatchMesh *patch, int index, int type);
extern BOOL filterVerts; extern BOOL filterVerts;
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------

22
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_EPM_Surface.cpp
View file

@ -15,7 +15,7 @@ extern int sbmParams[4];
extern DWORD sbsParams[3]; extern DWORD sbsParams[3];
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------
BOOL CALLBACK SelectByMatDlgProc( INT_PTR CALLBACK SelectByMatDlgProc(
HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
static int *param; static int *param;
@ -84,7 +84,7 @@ void SetSmoothButtonState(HWND hWnd, DWORD bits, DWORD invalid, DWORD unused = 0
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------
BOOL CALLBACK SelectBySmoothDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK SelectBySmoothDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
static DWORD *param; static DWORD *param;
switch (msg) switch (msg)
@ -137,9 +137,9 @@ BOOL CALLBACK SelectBySmoothDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------
BOOL CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
EditPatchMod *ep =(EditPatchMod *)GetWindowLong(hDlg, GWL_USERDATA); EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
if (!ep && message != WM_INITDIALOG) if (!ep && message != WM_INITDIALOG)
return FALSE; return FALSE;
@ -150,7 +150,7 @@ BOOL CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
ep =(EditPatchMod *)lParam; ep =(EditPatchMod *)lParam;
ep->hTilePanel = hDlg; ep->hTilePanel = hDlg;
SetWindowLong(hDlg, GWL_USERDATA, (LONG)ep); SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
ep->tileNum = SetupIntSpinner(hDlg, IDC_TILE_MAT_SPIN, IDC_TILE_MAT, 0, 65535, 0); ep->tileNum = SetupIntSpinner(hDlg, IDC_TILE_MAT_SPIN, IDC_TILE_MAT, 0, 65535, 0);
ep->tileRot = SetupIntSpinner(hDlg, IDC_TILE_ROT_SPIN, IDC_TILE_ROT, 0, 3, 0); ep->tileRot = SetupIntSpinner(hDlg, IDC_TILE_ROT_SPIN, IDC_TILE_ROT, 0, 3, 0);
ep->SetTileDlgEnables(); ep->SetTileDlgEnables();
@ -249,9 +249,9 @@ BOOL CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------
BOOL CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
EditPatchMod *ep =(EditPatchMod *)GetWindowLong(hDlg, GWL_USERDATA); EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
if (!ep && message != WM_INITDIALOG) if (!ep && message != WM_INITDIALOG)
return FALSE; return FALSE;
@ -262,7 +262,7 @@ BOOL CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
ep =(EditPatchMod *)lParam; ep =(EditPatchMod *)lParam;
ep->hEdgePanel = hDlg; ep->hEdgePanel = hDlg;
SetWindowLong(hDlg, GWL_USERDATA, (LONG)ep); SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
ep->SetEdgeDlgEnables(); ep->SetEdgeDlgEnables();
return TRUE; return TRUE;
} }
@ -324,9 +324,9 @@ BOOL CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------
BOOL CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
EditPatchMod *ep =(EditPatchMod *)GetWindowLong(hDlg, GWL_USERDATA); EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
if (!ep && message != WM_INITDIALOG) if (!ep && message != WM_INITDIALOG)
return FALSE; return FALSE;
@ -339,7 +339,7 @@ BOOL CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
for (int i = IDC_SMOOTH_GRP1; i < IDC_SMOOTH_GRP1 + 32; i++) for (int i = IDC_SMOOTH_GRP1; i < IDC_SMOOTH_GRP1 + 32; i++)
SendMessage(GetDlgItem(hDlg, i), CC_COMMAND, CC_CMD_SET_TYPE, CBT_CHECK); SendMessage(GetDlgItem(hDlg, i), CC_COMMAND, CC_CMD_SET_TYPE, CBT_CHECK);
SetWindowLong(hDlg, GWL_USERDATA, (LONG)ep); SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
ep->matSpin = SetupIntSpinner(hDlg, IDC_MAT_IDSPIN, IDC_MAT_ID, 1, MAX_MATID, 0); ep->matSpin = SetupIntSpinner(hDlg, IDC_MAT_IDSPIN, IDC_MAT_ID, 1, MAX_MATID, 0);
ep->tessUSpin = SetupIntSpinner(hDlg, IDC_TESS_U_SPIN, IDC_TESS_U2, 1, 4, RPO_DEFAULT_TESSEL); ep->tessUSpin = SetupIntSpinner(hDlg, IDC_TESS_U_SPIN, IDC_TESS_U2, 1, 4, RPO_DEFAULT_TESSEL);
ep->tessVSpin = SetupIntSpinner(hDlg, IDC_TESS_V_SPIN, IDC_TESS_V2, 1, 4, RPO_DEFAULT_TESSEL); ep->tessVSpin = SetupIntSpinner(hDlg, IDC_TESS_V_SPIN, IDC_TESS_V2, 1, 4, RPO_DEFAULT_TESSEL);

10
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_EPM_Tess.cpp
View file

@ -10,7 +10,7 @@
#define PROMPT_TIME 2000 #define PROMPT_TIME 2000
extern AdvParams sParams; extern AdvParams sParams;
BOOL CALLBACK AdvParametersDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AdvParametersDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------
@ -210,9 +210,9 @@ void EditPatchMod::SetTessUI(HWND hDlg, TessApprox *tess)
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------
BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
EditPatchMod *ep =(EditPatchMod *)GetWindowLong(hDlg, GWL_USERDATA); EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
if (!ep && message != WM_INITDIALOG) if (!ep && message != WM_INITDIALOG)
return FALSE; return FALSE;
@ -223,7 +223,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
ep =(EditPatchMod *)lParam; ep =(EditPatchMod *)lParam;
ep->hSurfPanel = hDlg; ep->hSurfPanel = hDlg;
SetWindowLong(hDlg, GWL_USERDATA, (LONG)ep); SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
if (!ep->settingViewportTess && ep->settingDisp && ep->GetProdTess().type == TESS_SET) if (!ep->settingViewportTess && ep->settingDisp && ep->GetProdTess().type == TESS_SET)
ep->settingDisp = FALSE; ep->settingDisp = FALSE;
TessApprox t; TessApprox t;
@ -599,7 +599,7 @@ static ISpinnerControl* psMaxTrisSpin = NULL;
// this max matches the MI max. // this max matches the MI max.
#define MAX_SUBDIV 7 #define MAX_SUBDIV 7
static BOOL initing = FALSE; // this is a hack but CenterWindow causes bad commands static BOOL initing = FALSE; // this is a hack but CenterWindow causes bad commands
BOOL CALLBACK INT_PTR CALLBACK
AdvParametersDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) AdvParametersDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch (uMsg) switch (uMsg)

4
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_EditPatchMod.cpp
View file

@ -264,7 +264,7 @@ void EditPatchMod::NewSetByOperator(TSTR &newName, Tab < int> &sets, int op)
// Named selection set copy/paste methods follow... // Named selection set copy/paste methods follow...
static BOOL CALLBACK PickSetNameDlgProc( static INT_PTR CALLBACK PickSetNameDlgProc(
HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
static TSTR *name; static TSTR *name;
@ -328,7 +328,7 @@ BOOL EditPatchMod::GetUniqueSetName(TSTR &name)
static BOOL CALLBACK PickSetDlgProc( static INT_PTR CALLBACK PickSetDlgProc(
HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
switch (msg) switch (msg)

12
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_Main.cpp
View file

@ -9,12 +9,12 @@
#define PROMPT_TIME 2000 #define PROMPT_TIME 2000
BOOL CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
extern void CancelEditPatchModes(IObjParam *ip); extern void CancelEditPatchModes(IObjParam *ip);

12
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_Rollup.cpp
View file

@ -33,10 +33,10 @@ extern void CancelEditPatchModes(IObjParam *ip);
extern void LoadImages(); extern void LoadImages();
BOOL CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
static char string[64]; static char string[64];
EditPatchMod *ep =(EditPatchMod *)GetWindowLong(hDlg, GWL_USERDATA); EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
ICustToolbar *iToolbar; ICustToolbar *iToolbar;
if (!ep && message != WM_INITDIALOG) if (!ep && message != WM_INITDIALOG)
return FALSE; return FALSE;
@ -104,7 +104,7 @@ BOOL CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
ep =(EditPatchMod *)lParam; ep =(EditPatchMod *)lParam;
ep->hSelectPanel = hDlg; ep->hSelectPanel = hDlg;
SetWindowLong(hDlg, GWL_USERDATA, (LONG)ep); SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
// Set up the editing level selector // Set up the editing level selector
LoadImages(); LoadImages();
iToolbar = GetICustToolbar(GetDlgItem(hDlg, IDC_SELTYPE)); iToolbar = GetICustToolbar(GetDlgItem(hDlg, IDC_SELTYPE));
@ -349,9 +349,9 @@ void EditPatchMod::SetOpsDlgEnables()
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------
BOOL CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
EditPatchMod *ep =(EditPatchMod *)GetWindowLong(hDlg, GWL_USERDATA); EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
if (!ep && message != WM_INITDIALOG) if (!ep && message != WM_INITDIALOG)
return FALSE; return FALSE;
@ -367,7 +367,7 @@ BOOL CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
ep->hOpsPanel = hDlg; ep->hOpsPanel = hDlg;
for (int i = IDC_SMOOTH_GRP1; i < IDC_SMOOTH_GRP1 + 32; i++) for (int i = IDC_SMOOTH_GRP1; i < IDC_SMOOTH_GRP1 + 32; i++)
SendMessage(GetDlgItem(hDlg, i), CC_COMMAND, CC_CMD_SET_TYPE, CBT_CHECK); SendMessage(GetDlgItem(hDlg, i), CC_COMMAND, CC_CMD_SET_TYPE, CBT_CHECK);
SetWindowLong(hDlg, GWL_USERDATA, (LONG)ep); SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
ICustButton *but = GetICustButton(GetDlgItem(hDlg, IDC_ATTACH)); ICustButton *but = GetICustButton(GetDlgItem(hDlg, IDC_ATTACH));
but->SetHighlightColor(GREEN_WASH); but->SetHighlightColor(GREEN_WASH);
but->SetType(CBT_CHECK); but->SetType(CBT_CHECK);

2
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_editpops.cpp
View file

@ -50,7 +50,7 @@ EPTempData::EPTempData(EditPatchMod *m,EditPatchData *pd)
mod = m; mod = m;
} }
void EPTempData::Invalidate(DWORD part,BOOL patchValid) void EPTempData::Invalidate(PartID part,BOOL patchValid)
{ {
if ( !patchValid ) if ( !patchValid )
{ {

4
code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_mods.cpp
View file

@ -225,11 +225,11 @@ __declspec( dllexport ) ULONG CanAutoDefer()
BOOL CALLBACK DefaultSOTProc( BOOL CALLBACK DefaultSOTProc(
HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam) HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
{ {
IObjParam *ip = (IObjParam*)GetWindowLong(hWnd,GWL_USERDATA); IObjParam *ip = (IObjParam*)GetWindowLongPtr(hWnd,GWLP_USERDATA);
switch (msg) { switch (msg) {
case WM_INITDIALOG: case WM_INITDIALOG:
SetWindowLong(hWnd,GWL_USERDATA,lParam); SetWindowLongPtr(hWnd,GWLP_USERDATA,lParam);
break; break;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:

4
code/ryzom/tools/leveldesign/georges_dll/imagelist_ex.cpp
View file

@ -27,8 +27,8 @@ using namespace NLMISC;
#pragma warning (disable : 4786) #pragma warning (disable : 4786)
BOOL CALLBACK EnumResLangProc(HINSTANCE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLanguage, BOOL CALLBACK EnumResLangProc(HMODULE hModule, LPCSTR lpszType, LPCSTR lpszName, WORD wIDLanguage,
LONG lParam) LONG_PTR lParam)
{ {
set<HRSRC> *iconNames = (set<HRSRC>*)lParam; set<HRSRC> *iconNames = (set<HRSRC>*)lParam;

2
code/ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.cpp
View file

@ -186,7 +186,7 @@ void CSoundDialog::setPlaying(bool play)
// *************************************************************************** // ***************************************************************************
void CSoundDialog::OnTimer(UINT id) void CSoundDialog::OnTimer(UINT_PTR id)
{ {
AFX_MANAGE_STATE(AfxGetStaticModuleState()); AFX_MANAGE_STATE(AfxGetStaticModuleState());
updateTime(); updateTime();

2
code/ryzom/tools/leveldesign/georges_plugin_sound/sound_dialog.h
View file

@ -126,7 +126,7 @@ private:
// Generated message map functions // Generated message map functions
//{{AFX_MSG(CSoundDialog) //{{AFX_MSG(CSoundDialog)
afx_msg void OnTimer(UINT id); afx_msg void OnTimer(UINT_PTR id);
afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
afx_msg void OnControlPlayback(); afx_msg void OnControlPlayback();
afx_msg void OnZoom(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnZoom(NMHDR* pNMHDR, LRESULT* pResult);

2
code/ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.cpp
View file

@ -51,7 +51,7 @@ END_MESSAGE_MAP()
// *************************************************************************** // ***************************************************************************
int CFileDialogEx::DoModal () INT_PTR CFileDialogEx::DoModal ()
{ {
// Get the path // Get the path
char path[512]; char path[512];

2
code/ryzom/tools/leveldesign/world_editor/world_editor/file_dialog_ex.h
View file

@ -41,7 +41,7 @@ public:
LPCTSTR lpszFilter = NULL, LPCTSTR lpszFilter = NULL,
CWnd* pParentWnd = NULL); CWnd* pParentWnd = NULL);
virtual int DoModal( ); virtual INT_PTR DoModal( );
virtual BOOL OnCommand( WPARAM wParam, LPARAM lParam ); virtual BOOL OnCommand( WPARAM wParam, LPARAM lParam );

4
code/ryzom/tools/leveldesign/world_editor/world_editor/imagelist_ex.cpp
View file

@ -27,8 +27,8 @@ using namespace NLMISC;
#pragma warning (disable : 4786) #pragma warning (disable : 4786)
BOOL CALLBACK EnumResLangProc(HINSTANCE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLanguage, BOOL CALLBACK EnumResLangProc(HMODULE hModule, LPCSTR lpszType, LPCSTR lpszName, WORD wIDLanguage,
LONG lParam) LONG_PTR lParam)
{ {
set<HRSRC> *iconNames = (set<HRSRC>*)lParam; set<HRSRC> *iconNames = (set<HRSRC>*)lParam;

2
code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp
View file

@ -3304,7 +3304,7 @@ void CMainFrame::OnUpdateEditSelectChildren(CCmdUI* pCmdUI)
// *************************************************************************** // ***************************************************************************
void CMainFrame::OnTimer(UINT nIDEvent) void CMainFrame::OnTimer(UINT_PTR nIDEvent)
{ {
if (nIDEvent == TIMER_UPDATE_FILES) if (nIDEvent == TIMER_UPDATE_FILES)
{ {

2
code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h
View file

@ -470,7 +470,7 @@ public:
afx_msg void OnUpdateEditCollapse(CCmdUI* pCmdUI); afx_msg void OnUpdateEditCollapse(CCmdUI* pCmdUI);
afx_msg void OnEditSelectChildren(); afx_msg void OnEditSelectChildren();
afx_msg void OnUpdateEditSelectChildren(CCmdUI* pCmdUI); afx_msg void OnUpdateEditSelectChildren(CCmdUI* pCmdUI);
afx_msg void OnTimer(UINT nIDEvent); afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnEditExpand (); afx_msg void OnEditExpand ();
afx_msg void OnEditCollapse (); afx_msg void OnEditCollapse ();
afx_msg void OnHelpFinder(); afx_msg void OnHelpFinder();