fixed getIconName in addIcon
This commit is contained in:
parent
0f270ee38f
commit
14cd008c76
3 changed files with 7 additions and 7 deletions
|
@ -22,7 +22,7 @@
|
|||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
|
||||
// $Id: Basemenu.cc,v 1.15 2002/03/23 15:14:45 fluxgen Exp $
|
||||
// $Id: Basemenu.cc,v 1.16 2002/03/27 18:47:12 fluxgen Exp $
|
||||
|
||||
//use GNU extensions
|
||||
#ifndef _GNU_SOURCE
|
||||
|
@ -224,7 +224,7 @@ int Basemenu::insert(const char *label, Basemenu *submenu, int pos) {
|
|||
return menuitems.size();
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
int Basemenu::insert(const char **ulabel, int pos, int function) {
|
||||
assert(ulabel);
|
||||
BasemenuItem *item = new BasemenuItem(*ulabel, function);
|
||||
|
@ -236,7 +236,7 @@ int Basemenu::insert(const char **ulabel, int pos, int function) {
|
|||
|
||||
return menuitems.size();
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
int Basemenu::remove(unsigned int index) {
|
||||
if (index >= menuitems.size()) {
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
|
||||
// $Id: Basemenu.hh,v 1.8 2002/03/20 14:10:03 fluxgen Exp $
|
||||
// $Id: Basemenu.hh,v 1.9 2002/03/27 18:47:12 fluxgen Exp $
|
||||
|
||||
#ifndef BASEMENU_HH
|
||||
#define BASEMENU_HH
|
||||
|
@ -53,7 +53,7 @@ public:
|
|||
|
||||
inline const char *getLabel(void) const { return menu.label; }
|
||||
|
||||
int insert(const char *, int = 0, const char * = (const char *) 0, int = -1);
|
||||
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);
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
|
||||
// $Id: Screen.cc,v 1.38 2002/03/23 15:14:45 fluxgen Exp $
|
||||
// $Id: Screen.cc,v 1.39 2002/03/27 18:47:12 fluxgen Exp $
|
||||
|
||||
//use GNU extensions
|
||||
#ifndef _GNU_SOURCE
|
||||
|
@ -696,7 +696,7 @@ void BScreen::addIcon(FluxboxWindow *w) {
|
|||
|
||||
iconList.push_back(w);
|
||||
|
||||
iconmenu->insert((const char **) w->getIconTitle());
|
||||
iconmenu->insert(w->getIconTitle());
|
||||
iconmenu->update();
|
||||
toolbar->addIcon(w);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue