X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=c%2B%2B%2Fcursesm.cc;h=64f36358cd9980a0c649a718adf534d6d9239b6f;hb=63d26709472433a4660c88461162252bf0e5fde8;hp=22b785bc6270ced03ed5c090ac6fdaa7368af9d8;hpb=a8987e73ec254703634802b4f7ee30d3a485524d;p=ncurses.git
diff --git a/c++/cursesm.cc b/c++/cursesm.cc
index 22b785bc..64f36358 100644
--- a/c++/cursesm.cc
+++ b/c++/cursesm.cc
@@ -1,6 +1,7 @@
// * this is for making emacs happy: -*-Mode: C++;-*-
/****************************************************************************
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
+ * Copyright 2019-2020,2021 Thomas E. Dickey *
+ * Copyright 1998-2011,2017 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -35,23 +36,27 @@
#include "cursesm.h"
#include "cursesapp.h"
-MODULE_ID("$Id: cursesm.cc,v 1.18 2003/10/25 15:04:46 tom Exp $")
+MODULE_ID("$Id: cursesm.cc,v 1.27 2021/04/17 18:11:08 tom Exp $")
-NCursesMenuItem::~NCursesMenuItem() {
+NCursesMenuItem::~NCursesMenuItem() THROWS(NCursesException)
+{
if (item)
OnError(::free_item(item));
}
bool
-NCursesMenuItem::action() {
+NCursesMenuItem::action()
+{
return FALSE;
-};
+}
-NCursesMenuCallbackItem::~NCursesMenuCallbackItem() {
+NCursesMenuCallbackItem::~NCursesMenuCallbackItem() THROWS(NCursesException)
+{
}
bool
-NCursesMenuCallbackItem::action() {
+NCursesMenuCallbackItem::action()
+{
if (p_fct)
return p_fct (*this);
else
@@ -64,24 +69,28 @@ NCursesMenuCallbackItem::action() {
* implementing a virtual method in a derived class
*/
void
-NCursesMenu::mnu_init(MENU *m) {
- getHook(m)->On_Menu_Init();
+_nc_xx_mnu_init(MENU *m)
+{
+ NCursesMenu::getHook(m)->On_Menu_Init();
}
void
-NCursesMenu::mnu_term(MENU *m) {
- getHook(m)->On_Menu_Termination();
+_nc_xx_mnu_term(MENU *m)
+{
+ NCursesMenu::getHook(m)->On_Menu_Termination();
}
void
-NCursesMenu::itm_init(MENU *m) {
- NCursesMenu* M = getHook(m);
+_nc_xx_itm_init(MENU *m)
+{
+ NCursesMenu* M = NCursesMenu::getHook(m);
M->On_Item_Init (*(M->current_item ()));
}
void
-NCursesMenu::itm_term(MENU *m) {
- NCursesMenu* M = getHook(m);
+_nc_xx_itm_term(MENU *m)
+{
+ NCursesMenu* M = NCursesMenu::getHook(m);
M->On_Item_Termination (*(M->current_item ()));
}
@@ -89,30 +98,32 @@ NCursesMenu::itm_term(MENU *m) {
* objects.
*/
ITEM**
-NCursesMenu::mapItems(NCursesMenuItem* nitems[]) {
+NCursesMenu::mapItems(NCursesMenuItem* nitems[])
+{
int itemCount = 0,lcv;
for (lcv=0; nitems[lcv]->item; ++lcv)
++itemCount;
- ITEM** items = new ITEM*[itemCount + 1];
+ ITEM** itemArray = new ITEM*[itemCount + 1];
for (lcv=0;nitems[lcv]->item;++lcv) {
- items[lcv] = nitems[lcv]->item;
+ itemArray[lcv] = nitems[lcv]->item;
}
- items[lcv] = NULL;
+ itemArray[lcv] = NULL;
my_items = nitems;
if (menu)
delete[] ::menu_items(menu);
- return items;
+ return itemArray;
}
void
NCursesMenu::InitMenu(NCursesMenuItem* nitems[],
bool with_frame,
- bool autoDelete_Items) {
+ bool autoDelete_Items)
+{
int mrows, mcols;
keypad(TRUE);
@@ -121,7 +132,7 @@ NCursesMenu::InitMenu(NCursesMenuItem* nitems[],
b_framed = with_frame;
b_autoDelete = autoDelete_Items;
- menu = (MENU*)0;
+ menu = static_cast