X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=graphiq%2Flibrary%2Fuser_interface%2Fmenu_base.cpp;fp=graphiq%2Flibrary%2Fuser_interface%2Fmenu_base.cpp;h=3c657c8d91b7f68fb25b7895e41d424ee25c5fa4;hb=d7e8a05960951d8ce67e36c587726a851e2f5165;hp=38c9aab50e3c9a5d667e9ff50de74b84fa732953;hpb=fa30e6adff1dea5d6b3903279ef024dd3bed043f;p=feisty_meow.git diff --git a/graphiq/library/user_interface/menu_base.cpp b/graphiq/library/user_interface/menu_base.cpp index 38c9aab5..3c657c8d 100644 --- a/graphiq/library/user_interface/menu_base.cpp +++ b/graphiq/library/user_interface/menu_base.cpp @@ -117,7 +117,7 @@ void menu_base::add_item(menu_item *to_invoke) menu_item *menu_base::get_item(int index) { - bounds_return(index, 0, _items->elements(), NIL); + bounds_return(index, 0, _items->elements(), NULL_POINTER); return dynamic_cast(_items->borrow(index)); } @@ -145,7 +145,7 @@ void menu_base::add_submenu(menu_base *sub) menu_base *menu_base::get_submenu(int index) { - bounds_return(index, 0, _menus->elements(), NIL); + bounds_return(index, 0, _menus->elements(), NULL_POINTER); return dynamic_cast(_menus->borrow(index)); } @@ -167,7 +167,7 @@ menu_common_base *menu_base::evaluate_trigger(char trigger) { //hmmm: implement this too.... if (!trigger){} -return NIL; +return NULL_POINTER; } void menu_base::activate()