* misc: add the unique names for private custom classes for MUI4 and …

…up only. With MUI 3.8 this causes crashes. This closes #2.
amiga-mui · Jan 15, 2018 · 4060034 · 4060034
1 parent a770424
commit 4060034
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,11 @@
 MUI NList MCC classes - ChangeLog
 ---------------------------------
 
+2018-01-15 Thore B�ckelmann <[email protected]>
+
+  * misc: add the unique names for private custom classes for MUI4 and up only.
+    With MUI 3.8 this causes crashes. This closes #2.
+
 #### v0.123 RELEASE ###########################################################
 
 2018-01-11 Thore B�ckelmann <[email protected]>

diff --git a/nlist_mcc/NList_grp.c b/nlist_mcc/NList_grp.c
@@ -79,8 +79,11 @@ struct MUI_CustomClass *NGR_Create(void)
 {
   if((NGR_Class = MUI_CreateCustomClass(NULL, (STRPTR)MUIC_Group, NULL, sizeof(struct NGRData), ENTRY(NGR_Dispatcher))) != NULL)
   {
-    // set up unique names for our custom classes
-    NGR_Class->mcc_Class->cl_ID = (ClassID)MUIC_NList "/NGR";
+    if(LIB_VERSION_IS_AT_LEAST(MUIMasterBase, 20, 0))
+    {
+      // set up unique names for our custom classes
+      NGR_Class->mcc_Class->cl_ID = (ClassID)MUIC_NList "/NGR";
+    }
   }
 
   return (NGR_Class);

diff --git a/nlist_mcc/NList_img.c b/nlist_mcc/NList_img.c
@@ -99,8 +99,11 @@ struct MUI_CustomClass *NLI_Create(void)
 {
   if((NLI_Class = MUI_CreateCustomClass(NULL, (STRPTR)MUIC_Image, NULL, sizeof(struct NLIData), ENTRY(NLI_Dispatcher))) != NULL)
   {
-    // set up unique names for our custom classes
-    NLI_Class->mcc_Class->cl_ID = (ClassID)MUIC_NList "/NLI";
+    if(LIB_VERSION_IS_AT_LEAST(MUIMasterBase, 20, 0))
+    {
+      // set up unique names for our custom classes
+      NLI_Class->mcc_Class->cl_ID = (ClassID)MUIC_NList "/NLI";
+    }
   }
 
   return (NLI_Class);

diff --git a/nlist_mcc/NList_img2.c b/nlist_mcc/NList_img2.c
@@ -100,9 +100,13 @@ struct MUI_CustomClass *NLI2_Create(void)
   //NLI2_Class = MUI_CreateCustomClass(NULL, MUIC_Image, NULL, sizeof(struct NLIData), ENTRY(NLI2_Dispatcher));
   if((NLI2_Class = MUI_CreateCustomClass(NULL, MUIC_Image, NULL, sizeof(struct NLIData), ENTRY(NLI_Dispatcher))) != NULL)
   {
-    // set up unique names for our custom classes
-    NLI2_Class->mcc_Class->cl_ID = (ClassID)MUIC_NList "/NLI2";
+    if(LIB_VERSION_IS_AT_LEAST(MUIMasterBase, 20, 0))
+    {
+      // set up unique names for our custom classes
+      NLI2_Class->mcc_Class->cl_ID = (ClassID)MUIC_NList "/NLI2";
+    }
   }
+
   return (NLI2_Class);
 }
 

diff --git a/nlisttree_mcc/NListtree.c b/nlisttree_mcc/NListtree.c
@@ -5284,9 +5284,12 @@ IPTR _New(struct IClass *cl, Object *obj, struct opSet *msg)
         {
           if((data->CL_NodeImage = MUI_CreateCustomClass(NULL, (STRPTR)MUIC_Image, NULL, sizeof(struct TreeImage_Data), ENTRY(NodeImage_Dispatcher))))
           {
-            // set up unique names for our custom classes
-            data->CL_TreeImage->mcc_Class->cl_ID = (ClassID)MUIC_NListtree "/treeimage";
-            data->CL_NodeImage->mcc_Class->cl_ID = (ClassID)MUIC_NListtree "/nodeimage";
+            if(LIB_VERSION_IS_AT_LEAST(MUIMasterBase, 20, 0))
+            {
+              // set up unique names for our custom classes
+              data->CL_TreeImage->mcc_Class->cl_ID = (ClassID)MUIC_NListtree "/treeimage";
+              data->CL_NodeImage->mcc_Class->cl_ID = (ClassID)MUIC_NListtree "/nodeimage";
+            }
 
             ActivateNotify( data );