From 3a5907c1c40bae0ec70acda808eeaa4044bd0943 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 26 Jan 2015 00:05:01 +0000 Subject: Move everything else over to using the class pointers. Exception: popupmenu.class is still using old _GetClass functions. --- amiga/libs.h | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) (limited to 'amiga/libs.h') diff --git a/amiga/libs.h b/amiga/libs.h index c80c61e73..a3ce92b2f 100644 --- a/amiga/libs.h +++ b/amiga/libs.h @@ -21,13 +21,22 @@ #include /* BOOPSI classes */ +extern Class *ARexxClass; extern Class *BevelClass; extern Class *BitMapClass; extern Class *ButtonClass; +extern Class *CheckBoxClass; extern Class *ChooserClass; extern Class *ClickTabClass; +extern Class *FuelGaugeClass; +extern Class *GetFileClass; +extern Class *GetFontClass; +extern Class *GetScreenModeClass; +extern Class *IntegerClass; +extern Class *LabelClass; extern Class *LayoutClass; extern Class *ListBrowserClass; +extern Class *RadioButtonClass; extern Class *ScrollerClass; extern Class *SpaceClass; extern Class *SpeedBarClass; @@ -35,18 +44,28 @@ extern Class *StringClass; extern Class *WindowClass; /* New improved ReAction macros! */ -#define BevelObj NewObject(BevelClass, NULL -#define BitMapObj NewObject(BitMapClass, NULL -#define ButtonObj NewObject(ButtonClass, NULL -#define ChooserObj NewObject(ChooserClass, NULL -#define ClickTabObj NewObject(ClickTabClass, NULL -#define LayoutHObj NewObject(LayoutClass, NULL, LAYOUT_Orientation, LAYOUT_ORIENT_HORIZ -#define LayoutVObj NewObject(LayoutClass, NULL, LAYOUT_Orientation, LAYOUT_ORIENT_VERT -#define ScrollerObj NewObject(ScrollerClass, NULL -#define SpaceObj NewObject(SpaceClass, NULL -#define SpeedBarObj NewObject(ScrollerClass, NULL -#define StringObj NewObject(StringClass, NULL -#define WindowObj NewObject(WindowClass, NULL +#define ARexxObj NewObject(ARexxClass, NULL +#define BevelObj NewObject(BevelClass, NULL +#define BitMapObj NewObject(BitMapClass, NULL +#define ButtonObj NewObject(ButtonClass, NULL +#define CheckBoxObj NewObject(CheckBoxClass, NULL +#define ChooserObj NewObject(ChooserClass, NULL +#define ClickTabObj NewObject(ClickTabClass, NULL +#define FuelGaugeObj NewObject(FuelGaugeClass, NULL +#define GetFileObj NewObject(GetFileClass, NULL +#define GetFontObj NewObject(GetFileClass, NULL +#define GetScreenModeObj NewObject(GetScreenModeClass, NULL +#define IntegerObj NewObject(IntegerClass, NULL +#define LabelObj NewObject(LabelClass, NULL +#define LayoutHObj NewObject(LayoutClass, NULL, LAYOUT_Orientation, LAYOUT_ORIENT_HORIZ +#define LayoutVObj NewObject(LayoutClass, NULL, LAYOUT_Orientation, LAYOUT_ORIENT_VERT +#define PageObj NewObject(NULL, "page.gadget" +#define RadioButtonObj NewObject(RadioButtonClass, NULL +#define ScrollerObj NewObject(ScrollerClass, NULL +#define SpaceObj NewObject(SpaceClass, NULL +#define SpeedBarObj NewObject(ScrollerClass, NULL +#define StringObj NewObject(StringClass, NULL +#define WindowObj NewObject(WindowClass, NULL /* Functions */ bool ami_libs_open(void); -- cgit v1.2.3