diff -Naur xtdesktop-0.7b/icon.cc xtdesktop-0.7b-magellan/icon.cc --- xtdesktop-0.7b/icon.cc 2005-11-15 13:07:02.000000000 +0100 +++ xtdesktop-0.7b-magellan/icon.cc 2008-06-04 15:14:53.000000000 +0200 @@ -42,7 +42,6 @@ WinWidth = WinHeight = 0; tpixmap = tmask = 0; Draging = False; - P = NULL; D = Dsk; #ifdef PRNDEBUG printf("== Creating icon %s ==>\n", (Caption)?(Caption):(ConfigFile)); @@ -152,10 +151,6 @@ Save (); } } - if (event->xbutton.button == Button3 && P) - { - P->Post (event->xbutton.x_root, event->xbutton.y_root); - } } void Icon::procBtnMotion (Widget w, XtPointer client_data, XEvent * event, Boolean * b) @@ -541,21 +536,12 @@ if (strlen ((char *) T->Query (menuCmd).c_str ())) { MenuCommand[i] = strdup ((char *) T->Query (menuCmd).c_str ()); - if (!P) - P = new PopupMenu (Win, Caption); - P->AddCommand (menuCmd, MenuCommand[i]); } else MenuCommand[i] = NULL; //++menuCmd[11]; } - if (!P) P = new PopupMenu (Win, Caption); - else { - snprintf(menuCmd, sizeof(menuCmd)-2, "MenuCommand%d", i++); - P->AddCommand (menuCmd, "Separator"); - } snprintf(menuCmd, sizeof(menuCmd)-2, "MenuCommand%d", i++); - P->AddProps ("propsMenuCmd", this); } diff -Naur xtdesktop-0.7b/icon.h xtdesktop-0.7b-magellan/icon.h --- xtdesktop-0.7b/icon.h 2004-06-12 07:28:58.000000000 +0200 +++ xtdesktop-0.7b-magellan/icon.h 2008-06-04 15:15:31.000000000 +0200 @@ -23,7 +23,6 @@ { private: Desk * D; - PopupMenu *P; #define MaxMenuCommands 32 char *MenuCommand[MaxMenuCommands+2]; #define MaxErrLen 80 @@ -80,7 +79,6 @@ //char *Cap, char *Com, int X, int Y); ~Icon (void) { - delete P; XtDestroyWidget(Win); XtDestroyWidget(Text); }; diff -Naur xtdesktop-0.7b/Makefile xtdesktop-0.7b-magellan/Makefile --- xtdesktop-0.7b/Makefile 2004-09-07 13:42:45.000000000 +0200 +++ xtdesktop-0.7b-magellan/Makefile 2008-06-04 15:16:26.000000000 +0200 @@ -15,8 +15,8 @@ .SUFFIXES: .cc .o bin = xtdesk -objs = desk.o icon.o main.o menu.o Database.o props.o -headers = desk.h icon.h menu.h Database.h +objs = desk.o icon.o main.o Database.o props.o +headers = desk.h icon.h Database.h all: $(bin) diff -Naur xtdesktop-0.7b/Makefile.linux xtdesktop-0.7b-magellan/Makefile.linux --- xtdesktop-0.7b/Makefile.linux 2004-09-07 13:42:45.000000000 +0200 +++ xtdesktop-0.7b-magellan/Makefile.linux 2008-06-04 15:16:26.000000000 +0200 @@ -15,8 +15,8 @@ .SUFFIXES: .cc .o bin = xtdesk -objs = desk.o icon.o main.o menu.o Database.o props.o -headers = desk.h icon.h menu.h Database.h +objs = desk.o icon.o main.o Database.o props.o +headers = desk.h icon.h Database.h all: $(bin)