aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-04-03 23:08:19 (GMT)
committerfluxgen <fluxgen>2002-04-03 23:08:19 (GMT)
commit53e66b49069ad299b5b776fde3004ab730fd5aba (patch)
tree0079ee6a0375dcc15b5e7803f46326891f1569fa
parent70f3639c0247c667b3ec5ddfb9e2726c08cbe12c (diff)
downloadfluxbox_paul-53e66b49069ad299b5b776fde3004ab730fd5aba.zip
fluxbox_paul-53e66b49069ad299b5b776fde3004ab730fd5aba.tar.bz2
removed int insert(const char **,...
-rw-r--r--src/Basemenu.cc16
-rw-r--r--src/Basemenu.hh4
2 files changed, 3 insertions, 17 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 71bc66d..cdb7ea2 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Basemenu.cc,v 1.16 2002/03/27 18:47:12 fluxgen Exp $ 25// $Id: Basemenu.cc,v 1.17 2002/04/03 23:08:19 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -224,20 +224,6 @@ int Basemenu::insert(const char *label, Basemenu *submenu, int pos) {
224 return menuitems.size(); 224 return menuitems.size();
225} 225}
226 226
227/*
228int Basemenu::insert(const char **ulabel, int pos, int function) {
229 assert(ulabel);
230 BasemenuItem *item = new BasemenuItem(*ulabel, function);
231 if (pos == -1) {
232 menuitems.push_back(item);
233 } else {
234 menuitems.insert(menuitems.begin() + pos, item);
235 }
236
237 return menuitems.size();
238}
239*/
240
241int Basemenu::remove(unsigned int index) { 227int Basemenu::remove(unsigned int index) {
242 if (index >= menuitems.size()) { 228 if (index >= menuitems.size()) {
243 #ifdef DEBUG 229 #ifdef DEBUG
diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index bfd27ca..f91e14f 100644
--- a/src/Basemenu.hh
+++ b/src/Basemenu.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Basemenu.hh,v 1.10 2002/04/03 12:08:53 fluxgen Exp $ 25// $Id: Basemenu.hh,v 1.11 2002/04/03 23:08:19 fluxgen Exp $
26 26
27#ifndef BASEMENU_HH 27#ifndef BASEMENU_HH
28#define BASEMENU_HH 28#define BASEMENU_HH
@@ -54,7 +54,7 @@ public:
54 inline const char *getLabel(void) const { return menu.label; } 54 inline const char *getLabel(void) const { return menu.label; }
55 55
56 int insert(const char *, int = 0, const char * = 0, int = -1); 56 int insert(const char *, int = 0, const char * = 0, int = -1);
57 int insert(const char **, int = -1, int = 0); 57
58 int insert(const char *, Basemenu *, int = -1); 58 int insert(const char *, Basemenu *, int = -1);
59 int remove(unsigned int item); 59 int remove(unsigned int item);
60 60