apply AROS modernization changes (#12)

* Update muiaros.h from current build. * TheButton class AROS changes * TheBar class AROS changes * TheBar.mcp class AROS changes * Other AROS changes * Use SIPTR as original code was using LONG. Added define for other platform. * Support buttons with MUIA_TheBar_Attr_Sleep == TRUE
amiga-mui · Feb 15, 2024 · 7bddc42 · 7bddc42
1 parent ad08f05
commit 7bddc42
Show file tree

Hide file tree

Showing 19 changed files with 2,939 additions and 1,248 deletions.
diff --git a/aros/s/mmakefile.src b/aros/s/mmakefile.src
@@ -1,10 +1,11 @@
 #   $Id$
 
-include $(TOP)/config/make.cfg
+include $(SRCDIR)/config/aros-contrib.cfg
 
 FILES := Package-Startup Package-Shutdown
 
-#MM- contrib-zune-classes-thebar-startup : workbench-prefs-envarc contrib-zune-classes-thebar-startupfiles contrib-zune-classes-thebar-envpackage
+#MM- contrib-zune-classes-thebar-startup : workbench-prefs-envarc contrib-zune-classes-thebar-startupfiles \
+#MM  contrib-zune-classes-thebar-envpackage
 
 #MM
 contrib-zune-classes-thebar-envpackage :
@@ -14,6 +15,5 @@ contrib-zune-classes-thebar-envpackage :
 #MM- contrib-zune-classes-thebar-mccv     : contrib-zune-classes-thebar-startup
 #MM- contrib-zune-classes-thebar-mcp      : contrib-zune-classes-thebar-startup
 
-#MM contrib-zune-classes-thebar-startupfiles :
-%copy_files_q dst=$(CONTRIBDIR)/Zune/MCC_TheBar/s maketarget=contrib-zune-classes-thebar-startupfiles
+%copy_files_q mmake=contrib-zune-classes-thebar-startupfiles dst=$(AROS_CONTRIB)/Zune/MCC_TheBar/s
 
diff --git a/demo/demo7.c b/demo/demo7.c
@@ -54,6 +54,14 @@ struct Library *MUIMasterBase;
 /***********************************************************************/
 
 #if !defined(__MORPHOS__)
+#ifdef __AROS__
+Object * DoSuperNew(struct IClass *cl, Object *obj, IPTR tag1, ...)
+{
+  AROS_SLOWSTACKTAGS_PRE_AS(tag1, Object *)
+  retval = (Object *)DoSuperMethod(cl, obj, OM_NEW, AROS_SLOWSTACKTAGS_ARG(tag1));
+  AROS_SLOWSTACKTAGS_POST
+}
+#else
 Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...)
 {
   Object *rc;
@@ -70,6 +78,7 @@ Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...)
   return rc;
 }
 #endif
+#endif
 
 /***********************************************************************/
 

diff --git a/demo/mmakefile.src b/demo/mmakefile.src
@@ -1,6 +1,6 @@
 #   $Id$
 
-include $(TOP)/config/make.cfg
+include $(SRCDIR)/config/aros-contrib.cfg
 
 #MM contrib-zune-classes-thebar-demos : includes linklibs \
 #MM contrib-zune-classes-thebar-mcc contrib-zune-classes-thebar-mccv \
@@ -24,8 +24,7 @@ USER_CFLAGS := -DNO_INLINE_STDARG
 USER_CFLAGS += $(PARANOIA_CFLAGS)
 
 %build_progs mmake=contrib-zune-classes-thebar-demos files=$(FILES) \
-    targetdir=$(TARGETDIR) \
-    uselibs="amiga mui"
+    targetdir=$(TARGETDIR)
 
 #MM
 contrib-zune-classes-thebar-pics :