From d7c2cd218de4fbfaf94d524dfde42c62673a8995 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 1 Sep 2011 09:02:50 +0000 Subject: [PATCH] proposed fix from ETC for max 2012 compilation issue --- pandatool/src/maxegg/maxEgg.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandatool/src/maxegg/maxEgg.cxx b/pandatool/src/maxegg/maxEgg.cxx index 91b9fdfef8..a8f2c2cbee 100755 --- a/pandatool/src/maxegg/maxEgg.cxx +++ b/pandatool/src/maxegg/maxEgg.cxx @@ -806,7 +806,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) if (!controlsInit) { controlsInit = TRUE; + +#ifdef MAX_VERSION_MAJOR < 14 + // It appears that InitCustomControls is deprecated in 2012. + // I'm not sure if we can just remove it like this, but + // I've heard that it seems to work, so let's do it like this. InitCustomControls(hInstance); // Initialize MAX's custom controls +#endif InitCommonControls(); // Initialize Win95 controls }