X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=c%2B%2B%2Fcursslk.cc;h=b0dd4ab0dc987294279a97c5f530938327339700;hb=141bf9b4f451aaab76480a358dec96cf60a66ec6;hp=ef393632de4e7eb6e3885a8f3146d578e40a46a3;hpb=97df2f335617625b7355c04e46175e316ef02544;p=ncurses.git diff --git a/c++/cursslk.cc b/c++/cursslk.cc index ef393632..b0dd4ab0 100644 --- a/c++/cursslk.cc +++ b/c++/cursslk.cc @@ -1,6 +1,7 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright (c) 1998-2012,2019 Free Software Foundation, Inc. * + * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 1998-2005,2012 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,7 +36,7 @@ #include "cursslk.h" #include "cursesapp.h" -MODULE_ID("$Id: cursslk.cc,v 1.17 2019/07/28 19:55:27 tom Exp $") +MODULE_ID("$Id: cursslk.cc,v 1.20 2022/02/26 17:57:23 tom Exp $") Soft_Label_Key_Set::Soft_Label_Key& Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text) @@ -55,6 +56,8 @@ Soft_Label_Key_Set::Label_Layout void Soft_Label_Key_Set::init() { + if (num_labels > 12) + num_labels = 12; slk_array = new Soft_Label_Key[num_labels]; for(int i=0; i < num_labels; i++) { slk_array[i].num = i+1; @@ -101,6 +104,10 @@ Soft_Label_Key_Set::Soft_Label_Key& Soft_Label_Key_Set::operator[](int i) { return slk_array[i-1]; } +int Soft_Label_Key_Set::labels() const { + return num_labels; +} + void Soft_Label_Key_Set::activate_label(int i, bool bf) { if (!b_attrInit) { NCursesApplication* A = NCursesApplication::getApplication();