equal
deleted
inserted
replaced
137 delete iMenuRoot; |
137 delete iMenuRoot; |
138 iMenuRoot = NULL; |
138 iMenuRoot = NULL; |
139 } |
139 } |
140 |
140 |
141 iCascadeArr.Close(); |
141 iCascadeArr.Close(); |
142 |
|
143 if (m_jsmenu) { |
|
144 KJS::Collector::unprotect(m_jsmenu); |
|
145 } |
|
146 |
|
147 if (m_jsmenuitemctr) { |
|
148 KJS::Collector::unprotect(m_jsmenuitemctr); |
|
149 } |
|
150 |
|
151 } |
142 } |
152 |
143 |
153 |
144 |
154 // ---------------------------------------------------------------------------- |
145 // ---------------------------------------------------------------------------- |
155 // CMenuClient::ConstructL |
146 // CMenuClient::ConstructL |
166 // CMenuClient::jsmenu |
157 // CMenuClient::jsmenu |
167 // |
158 // |
168 // |
159 // |
169 // |
160 // |
170 // ---------------------------------------------------------------------------- |
161 // ---------------------------------------------------------------------------- |
171 KJS::JSMenu* CMenuClient::jsmenu() |
162 KJS::JSMenu* CMenuClient::jsmenu(MJSObjectProtector* aProtector) |
172 { |
163 { |
173 if (!m_jsmenu) { |
164 if (!m_jsmenu) { |
174 m_jsmenu = new KJS::JSMenu(this); |
165 m_jsmenu = new KJS::JSMenu(this, aProtector); |
175 KJS::Collector::protect(m_jsmenu); |
|
176 } |
166 } |
177 |
167 |
178 return m_jsmenu; |
168 return m_jsmenu; |
179 } |
169 } |
180 |
170 |
183 // CMenuClient::jsmenuitem |
173 // CMenuClient::jsmenuitem |
184 // |
174 // |
185 // |
175 // |
186 // |
176 // |
187 // ---------------------------------------------------------------------------- |
177 // ---------------------------------------------------------------------------- |
188 KJS::JSMenuItemConstructor* CMenuClient::jsmenuitem() |
178 KJS::JSMenuItemConstructor* CMenuClient::jsmenuitem(MJSObjectProtector* protector) |
189 { |
179 { |
190 if (!m_jsmenuitemctr){ |
180 if (!m_jsmenuitemctr){ |
191 m_jsmenuitemctr = new KJS::JSMenuItemConstructor(this); |
181 m_jsmenuitemctr = new KJS::JSMenuItemConstructor(this, protector); |
192 KJS::Collector::protect(m_jsmenuitemctr); |
|
193 } |
182 } |
194 |
183 |
195 return m_jsmenuitemctr; |
184 return m_jsmenuitemctr; |
196 } |
185 } |
197 |
186 |