Browse Source

proposed fix from ETC for max 2012 compilation issue

rdb 14 years ago
parent
commit
d7c2cd218d
1 changed files with 6 additions and 0 deletions
  1. 6 0
      pandatool/src/maxegg/maxEgg.cxx

+ 6 - 0
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
         }