Browse Source

Add different SetText values to MaxCompat header.

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

Additionally, NotifyInfo should already be declared in notify.h.
Joseph Davies 11 years ago
parent
commit
c3d8e7e161
  1. 2
      Sources/Tools/MaxComponent/plMultistageStage.cpp
  2. 2
      Sources/Tools/MaxMain/MaxCompat.h
  3. 1
      Sources/Tools/MaxMain/plActionTableMgr.h
  4. 8
      Sources/Tools/MaxMain/plComponentDlg.h

2
Sources/Tools/MaxComponent/plMultistageStage.cpp

@ -362,7 +362,7 @@ static void LoadCombo(HWND hCombo, NameType* nameInt, int size, int curVal)
void plStandardStage::IInitDlg()
{
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);
LoadCombo(hForward, gForward, sizeof(gForward), fForward);

2
Sources/Tools/MaxMain/MaxCompat.h

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

1
Sources/Tools/MaxMain/plActionTableMgr.h

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

8
Sources/Tools/MaxMain/plComponentDlg.h

@ -44,14 +44,6 @@ class Class_ID;
class Interface;
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
{
protected:

Loading…
Cancel
Save