OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Add different SetText values to MaxCompat header.

Browse Source 
Restores compilation of Max 7 plugin, as its SetText expects
a non-const pointer.

Additionally, NotifyInfo should already be declared in notify.h.
This commit is contained in:
Joseph Davies
2014-04-21 08:07:43 -07:00
parent 58d79679d3
commit c3d8e7e161
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Tools/MaxComponent/plMultistageStage.cpp
View File

@ -362,7 +362,7 @@ static void LoadCombo(HWND hCombo, NameType* nameInt, int size, int curVal)
void plStandardStage::IInitDlg() void plStandardStage::IInitDlg()
{ {
ICustEdit* edit = GetICustEdit(GetDlgItem(fDlg, IDC_ANIM_NAME)); ICustEdit* edit = GetICustEdit(GetDlgItem(fDlg, IDC_ANIM_NAME));
edit->SetText(fAnimName.c_str()); edit->SetText(const_cast<SETTEXT_VALUE_TYPE>(fAnimName.c_str()));
HWND hForward = GetDlgItem(fDlg, IDC_FORWARD_COMBO); HWND hForward = GetDlgItem(fDlg, IDC_FORWARD_COMBO);
LoadCombo(hForward, gForward, sizeof(gForward), fForward); LoadCombo(hForward, gForward, sizeof(gForward), fForward);

2
Sources/Tools/MaxMain/MaxCompat.h
View File

@ -86,8 +86,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#if MAX_VERSION_MAJOR <= 10 // Max 2008 #if MAX_VERSION_MAJOR <= 10 // Max 2008
# define GETNAME_RETURN_TYPE TCHAR* # define GETNAME_RETURN_TYPE TCHAR*
# define SETTEXT_VALUE_TYPE MCHAR*
#else #else
# define GETNAME_RETURN_TYPE const TCHAR* # define GETNAME_RETURN_TYPE const TCHAR*
# define SETTEXT_VALUE_TYPE const MCHAR*
#endif #endif
// Old versions of Max define this as an integer, not a Class_ID // Old versions of Max define this as an integer, not a Class_ID

1
Sources/Tools/MaxMain/plActionTableMgr.h
View File

@ -50,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
class ActionCallback; class ActionCallback;
struct ActionDescription; struct ActionDescription;
struct NotifyInfo;
typedef bool(*ActionCallbackFunc)(int); typedef bool(*ActionCallbackFunc)(int);

8
Sources/Tools/MaxMain/plComponentDlg.h
View File

@ -44,14 +44,6 @@ class Class_ID;
class Interface; class Interface;
class plMaxNode; class plMaxNode;
#include <maxversion.h>
#if MAX_VERSION_MAJOR >= 9
struct NotifyInfo;
#else
// Max headers are more minimalistic in pre-9 maxes
# include <notify.h>
#endif
class plComponentDlg class plComponentDlg
{ {
protected: protected: