Annotation of /trunk/xtdesktop/patches/xtdesktop-0.7b-disable-menu.patch
Parent Directory | Revision Log
Revision 648 -
(hide annotations)
(download)
Wed Jun 4 13:15:49 2008 UTC (16 years, 3 months ago) by niro
File size: 2778 byte(s)
Wed Jun 4 13:15:49 2008 UTC (16 years, 3 months ago) by niro
File size: 2778 byte(s)
-patches for xtdesktop-0.7b-r1
1 | niro | 648 | diff -Naur xtdesktop-0.7b/icon.cc xtdesktop-0.7b-magellan/icon.cc |
2 | --- xtdesktop-0.7b/icon.cc 2005-11-15 13:07:02.000000000 +0100 | ||
3 | +++ xtdesktop-0.7b-magellan/icon.cc 2008-06-04 15:14:53.000000000 +0200 | ||
4 | @@ -42,7 +42,6 @@ | ||
5 | WinWidth = WinHeight = 0; | ||
6 | tpixmap = tmask = 0; | ||
7 | Draging = False; | ||
8 | - P = NULL; | ||
9 | D = Dsk; | ||
10 | #ifdef PRNDEBUG | ||
11 | printf("== Creating icon %s ==>\n", (Caption)?(Caption):(ConfigFile)); | ||
12 | @@ -152,10 +151,6 @@ | ||
13 | Save (); | ||
14 | } | ||
15 | } | ||
16 | - if (event->xbutton.button == Button3 && P) | ||
17 | - { | ||
18 | - P->Post (event->xbutton.x_root, event->xbutton.y_root); | ||
19 | - } | ||
20 | } | ||
21 | void | ||
22 | Icon::procBtnMotion (Widget w, XtPointer client_data, XEvent * event, Boolean * b) | ||
23 | @@ -541,21 +536,12 @@ | ||
24 | if (strlen ((char *) T->Query (menuCmd).c_str ())) | ||
25 | { | ||
26 | MenuCommand[i] = strdup ((char *) T->Query (menuCmd).c_str ()); | ||
27 | - if (!P) | ||
28 | - P = new PopupMenu (Win, Caption); | ||
29 | - P->AddCommand (menuCmd, MenuCommand[i]); | ||
30 | } | ||
31 | else | ||
32 | MenuCommand[i] = NULL; | ||
33 | //++menuCmd[11]; | ||
34 | } | ||
35 | - if (!P) P = new PopupMenu (Win, Caption); | ||
36 | - else { | ||
37 | - snprintf(menuCmd, sizeof(menuCmd)-2, "MenuCommand%d", i++); | ||
38 | - P->AddCommand (menuCmd, "Separator"); | ||
39 | - } | ||
40 | snprintf(menuCmd, sizeof(menuCmd)-2, "MenuCommand%d", i++); | ||
41 | - P->AddProps ("propsMenuCmd", this); | ||
42 | } | ||
43 | |||
44 | |||
45 | diff -Naur xtdesktop-0.7b/icon.h xtdesktop-0.7b-magellan/icon.h | ||
46 | --- xtdesktop-0.7b/icon.h 2004-06-12 07:28:58.000000000 +0200 | ||
47 | +++ xtdesktop-0.7b-magellan/icon.h 2008-06-04 15:15:31.000000000 +0200 | ||
48 | @@ -23,7 +23,6 @@ | ||
49 | { | ||
50 | private: | ||
51 | Desk * D; | ||
52 | - PopupMenu *P; | ||
53 | #define MaxMenuCommands 32 | ||
54 | char *MenuCommand[MaxMenuCommands+2]; | ||
55 | #define MaxErrLen 80 | ||
56 | @@ -80,7 +79,6 @@ | ||
57 | //char *Cap, char *Com, int X, int Y); | ||
58 | ~Icon (void) | ||
59 | { | ||
60 | - delete P; | ||
61 | XtDestroyWidget(Win); | ||
62 | XtDestroyWidget(Text); | ||
63 | }; | ||
64 | diff -Naur xtdesktop-0.7b/Makefile xtdesktop-0.7b-magellan/Makefile | ||
65 | --- xtdesktop-0.7b/Makefile 2004-09-07 13:42:45.000000000 +0200 | ||
66 | +++ xtdesktop-0.7b-magellan/Makefile 2008-06-04 15:16:26.000000000 +0200 | ||
67 | @@ -15,8 +15,8 @@ | ||
68 | .SUFFIXES: .cc .o | ||
69 | bin = xtdesk | ||
70 | |||
71 | -objs = desk.o icon.o main.o menu.o Database.o props.o | ||
72 | -headers = desk.h icon.h menu.h Database.h | ||
73 | +objs = desk.o icon.o main.o Database.o props.o | ||
74 | +headers = desk.h icon.h Database.h | ||
75 | |||
76 | all: $(bin) | ||
77 | |||
78 | diff -Naur xtdesktop-0.7b/Makefile.linux xtdesktop-0.7b-magellan/Makefile.linux | ||
79 | --- xtdesktop-0.7b/Makefile.linux 2004-09-07 13:42:45.000000000 +0200 | ||
80 | +++ xtdesktop-0.7b-magellan/Makefile.linux 2008-06-04 15:16:26.000000000 +0200 | ||
81 | @@ -15,8 +15,8 @@ | ||
82 | .SUFFIXES: .cc .o | ||
83 | bin = xtdesk | ||
84 | |||
85 | -objs = desk.o icon.o main.o menu.o Database.o props.o | ||
86 | -headers = desk.h icon.h menu.h Database.h | ||
87 | +objs = desk.o icon.o main.o Database.o props.o | ||
88 | +headers = desk.h icon.h Database.h | ||
89 | |||
90 | all: $(bin) | ||
91 |