all repos — fluxbox @ 53e66b49069ad299b5b776fde3004ab730fd5aba

custom fork of the fluxbox windowmanager

removed int insert(const char **,...
fluxgen fluxgen
commit

53e66b49069ad299b5b776fde3004ab730fd5aba

parent

70f3639c0247c667b3ec5ddfb9e2726c08cbe12c

2 files changed, 3 insertions(+), 17 deletions(-)

jump to
M src/Basemenu.ccsrc/Basemenu.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Basemenu.cc,v 1.16 2002/03/27 18:47:12 fluxgen Exp $ +// $Id: Basemenu.cc,v 1.17 2002/04/03 23:08:19 fluxgen Exp $ //use GNU extensions #ifndef _GNU_SOURCE

@@ -223,20 +223,6 @@ submenu->parent = this;

return menuitems.size(); } - -/* -int Basemenu::insert(const char **ulabel, int pos, int function) { - assert(ulabel); - BasemenuItem *item = new BasemenuItem(*ulabel, function); - if (pos == -1) { - menuitems.push_back(item); - } else { - menuitems.insert(menuitems.begin() + pos, item); - } - - return menuitems.size(); -} -*/ int Basemenu::remove(unsigned int index) { if (index >= menuitems.size()) {
M src/Basemenu.hhsrc/Basemenu.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Basemenu.hh,v 1.10 2002/04/03 12:08:53 fluxgen Exp $ +// $Id: Basemenu.hh,v 1.11 2002/04/03 23:08:19 fluxgen Exp $ #ifndef BASEMENU_HH #define BASEMENU_HH

@@ -54,7 +54,7 @@

inline const char *getLabel(void) const { return menu.label; } int insert(const char *, int = 0, const char * = 0, int = -1); - int insert(const char **, int = -1, int = 0); + int insert(const char *, Basemenu *, int = -1); int remove(unsigned int item);