]>
Commit | Line | Data |
---|---|---|
e9576ca5 SC |
1 | ///////////////////////////////////////////////////////////////////////////// |
2 | // Name: menu.cpp | |
3 | // Purpose: wxMenu, wxMenuBar, wxMenuItem | |
a31a5f85 | 4 | // Author: Stefan Csomor |
e9576ca5 | 5 | // Modified by: |
a31a5f85 | 6 | // Created: 1998-01-01 |
e9576ca5 | 7 | // RCS-ID: $Id$ |
a31a5f85 | 8 | // Copyright: (c) Stefan Csomor |
65571936 | 9 | // Licence: wxWindows licence |
e9576ca5 SC |
10 | ///////////////////////////////////////////////////////////////////////////// |
11 | ||
3d1a4878 | 12 | #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) |
eb22f2a6 GD |
13 | #pragma implementation "menu.h" |
14 | #pragma implementation "menuitem.h" | |
15 | #endif | |
16 | ||
e9576ca5 SC |
17 | // ============================================================================ |
18 | // headers & declarations | |
19 | // ============================================================================ | |
20 | ||
77ffb593 | 21 | // wxWidgets headers |
e9576ca5 SC |
22 | // ----------------- |
23 | ||
3d1a4878 SC |
24 | #include "wx/wxprec.h" |
25 | ||
03e11df5 | 26 | #include "wx/app.h" |
e9576ca5 SC |
27 | #include "wx/menu.h" |
28 | #include "wx/menuitem.h" | |
03e11df5 | 29 | #include "wx/window.h" |
e9576ca5 SC |
30 | #include "wx/log.h" |
31 | #include "wx/utils.h" | |
2b5f62a0 | 32 | #include "wx/frame.h" |
e9576ca5 | 33 | |
519cb848 SC |
34 | #include "wx/mac/uma.h" |
35 | ||
e9576ca5 SC |
36 | // other standard headers |
37 | // ---------------------- | |
38 | #include <string.h> | |
39 | ||
2f1ae414 | 40 | #if !USE_SHARED_LIBRARY |
e9576ca5 SC |
41 | IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) |
42 | IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) | |
2f1ae414 | 43 | #endif |
e9576ca5 | 44 | |
519cb848 | 45 | // the (popup) menu title has this special id |
de5914a1 | 46 | static const int idMenuTitle = -3; |
b03e4fcd | 47 | static MenuItemIndex firstUserHelpMenuItem = 0 ; |
519cb848 SC |
48 | |
49 | const short kwxMacMenuBarResource = 1 ; | |
50 | const short kwxMacAppleMenuId = 1 ; | |
51 | ||
de5914a1 SC |
52 | |
53 | // Find an item given the Macintosh Menu Reference | |
54 | ||
71f2fb52 | 55 | #if KEY_wxList_DEPRECATED |
de5914a1 SC |
56 | wxList wxWinMacMenuList(wxKEY_INTEGER); |
57 | wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef) | |
58 | { | |
59 | wxNode *node = wxWinMacMenuList.Find((long)inMenuRef); | |
60 | if (!node) | |
61 | return NULL; | |
62 | return (wxMenu *)node->GetData(); | |
63 | } | |
64 | ||
65 | void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) ; | |
66 | void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) | |
67 | { | |
68 | // adding NULL MenuRef is (first) surely a result of an error and | |
69 | // (secondly) breaks menu command processing | |
70 | wxCHECK_RET( inMenuRef != (MenuRef) NULL, wxT("attempt to add a NULL MenuRef to menu list") ); | |
71 | ||
72 | if ( !wxWinMacMenuList.Find((long)inMenuRef) ) | |
73 | wxWinMacMenuList.Append((long)inMenuRef, menu); | |
74 | } | |
75 | ||
76 | void wxRemoveMacMenuAssociation(wxMenu *menu) ; | |
77 | void wxRemoveMacMenuAssociation(wxMenu *menu) | |
78 | { | |
79 | wxWinMacMenuList.DeleteObject(menu); | |
80 | } | |
71f2fb52 RN |
81 | #else |
82 | ||
83 | WX_DECLARE_HASH_MAP(MenuRef, wxMenu*, wxPointerHash, wxPointerEqual, MacMenuMap); | |
84 | ||
85 | static MacMenuMap wxWinMacMenuList; | |
86 | ||
87 | wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef) | |
88 | { | |
89 | MacMenuMap::iterator node = wxWinMacMenuList.find(inMenuRef); | |
90 | ||
91 | return (node == wxWinMacMenuList.end()) ? NULL : node->second; | |
92 | } | |
93 | ||
94 | void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) ; | |
95 | void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) | |
96 | { | |
97 | // adding NULL MenuRef is (first) surely a result of an error and | |
98 | // (secondly) breaks menu command processing | |
99 | wxCHECK_RET( inMenuRef != (MenuRef) NULL, wxT("attempt to add a NULL MenuRef to menu list") ); | |
de5914a1 | 100 | |
71f2fb52 RN |
101 | wxWinMacMenuList[inMenuRef] = menu; |
102 | } | |
103 | ||
104 | void wxRemoveMacMenuAssociation(wxMenu *menu) ; | |
105 | void wxRemoveMacMenuAssociation(wxMenu *menu) | |
106 | { | |
107 | // iterate over all the elements in the class | |
108 | MacMenuMap::iterator it; | |
109 | for ( it = wxWinMacMenuList.begin(); it != wxWinMacMenuList.end(); ++it ) | |
110 | { | |
111 | if ( it->second == menu ) | |
112 | { | |
113 | wxWinMacMenuList.erase(it); | |
114 | break; | |
115 | } | |
116 | } | |
117 | } | |
118 | #endif // deprecated wxList | |
de5914a1 | 119 | |
e9576ca5 SC |
120 | // ============================================================================ |
121 | // implementation | |
122 | // ============================================================================ | |
7c15086c SC |
123 | static void wxMenubarUnsetInvokingWindow( wxMenu *menu ) ; |
124 | static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ); | |
519cb848 | 125 | |
e9576ca5 SC |
126 | // Menus |
127 | ||
128 | // Construct a menu with optional title (then use append) | |
519cb848 | 129 | |
f5c6eb5c | 130 | #ifdef __DARWIN__ |
82ca6dbc GD |
131 | short wxMenu::s_macNextMenuId = 3 ; |
132 | #else | |
519cb848 | 133 | short wxMenu::s_macNextMenuId = 2 ; |
82ca6dbc | 134 | #endif |
519cb848 | 135 | |
71f2fb52 RN |
136 | static |
137 | wxMenu * | |
138 | _wxMenuAt(const wxMenuList &menuList, size_t pos) | |
139 | { | |
140 | wxMenuList::compatibility_iterator menuIter = menuList.GetFirst(); | |
141 | ||
142 | while (pos-- > 0) menuIter = menuIter->GetNext(); | |
143 | ||
144 | return menuIter->GetData() ; | |
145 | } | |
146 | ||
e7549107 | 147 | void wxMenu::Init() |
e9576ca5 | 148 | { |
e7549107 | 149 | m_doBreak = FALSE; |
7c15086c | 150 | m_startRadioGroup = -1; |
e7549107 SC |
151 | |
152 | // create the menu | |
58751a86 | 153 | m_macMenuId = s_macNextMenuId++; |
a9412f8f | 154 | m_hMenu = UMANewMenu(m_macMenuId, m_title, wxFont::GetDefaultEncoding() ); |
e7549107 SC |
155 | |
156 | if ( !m_hMenu ) | |
157 | { | |
22026088 | 158 | wxLogLastError(wxT("UMANewMenu failed")); |
e7549107 SC |
159 | } |
160 | ||
de5914a1 SC |
161 | wxAssociateMenuWithMacMenu( (MenuRef)m_hMenu , this ) ; |
162 | ||
e7549107 SC |
163 | // if we have a title, insert it in the beginning of the menu |
164 | if ( !!m_title ) | |
e9576ca5 | 165 | { |
519cb848 | 166 | Append(idMenuTitle, m_title) ; |
e9576ca5 SC |
167 | AppendSeparator() ; |
168 | } | |
e7549107 | 169 | } |
e9576ca5 | 170 | |
e7549107 SC |
171 | wxMenu::~wxMenu() |
172 | { | |
de5914a1 | 173 | wxRemoveMacMenuAssociation( this ) ; |
e40298d5 JS |
174 | if (MAC_WXHMENU(m_hMenu)) |
175 | ::DisposeMenu(MAC_WXHMENU(m_hMenu)); | |
e9576ca5 SC |
176 | } |
177 | ||
e7549107 | 178 | void wxMenu::Break() |
e9576ca5 | 179 | { |
e40298d5 | 180 | // not available on the mac platform |
e7549107 | 181 | } |
e9576ca5 | 182 | |
7c15086c | 183 | void wxMenu::Attach(wxMenuBarBase *menubar) |
e7549107 | 184 | { |
7c15086c | 185 | wxMenuBase::Attach(menubar); |
e7549107 | 186 | |
7c15086c | 187 | EndRadioGroup(); |
e9576ca5 SC |
188 | } |
189 | ||
e9576ca5 | 190 | // function appends a new item or submenu to the menu |
e7549107 SC |
191 | // append a new item or submenu to the menu |
192 | bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) | |
e9576ca5 | 193 | { |
427ff662 | 194 | wxASSERT_MSG( pItem != NULL, wxT("can't append NULL item to the menu") ); |
e9576ca5 | 195 | |
e40298d5 JS |
196 | if ( pItem->IsSeparator() ) |
197 | { | |
198 | if ( pos == (size_t)-1 ) | |
199 | MacAppendMenu(MAC_WXHMENU(m_hMenu), "\p-"); | |
200 | else | |
201 | MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos); | |
202 | } | |
58751a86 | 203 | else |
e40298d5 JS |
204 | { |
205 | wxMenu *pSubMenu = pItem->GetSubMenu() ; | |
206 | if ( pSubMenu != NULL ) | |
207 | { | |
427ff662 | 208 | wxASSERT_MSG( pSubMenu->m_hMenu != NULL , wxT("invalid submenu added")); |
e40298d5 | 209 | pSubMenu->m_menuParent = this ; |
58751a86 | 210 | |
4224f059 | 211 | if (wxMenuBar::MacGetInstalledMenuBar() == GetMenuBar()) |
d46342af SC |
212 | { |
213 | pSubMenu->MacBeforeDisplay( true ) ; | |
214 | } | |
58751a86 | 215 | |
e40298d5 | 216 | if ( pos == (size_t)-1 ) |
a9412f8f | 217 | UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding() , pSubMenu->m_macMenuId); |
e40298d5 | 218 | else |
a9412f8f | 219 | UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding() , pos, pSubMenu->m_macMenuId); |
e40298d5 JS |
220 | pItem->UpdateItemBitmap() ; |
221 | pItem->UpdateItemStatus() ; | |
222 | } | |
223 | else | |
224 | { | |
225 | if ( pos == (size_t)-1 ) | |
226 | { | |
a9412f8f | 227 | UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), wxT("a") , wxFont::GetDefaultEncoding() ); |
e40298d5 JS |
228 | pos = CountMenuItems(MAC_WXHMENU(m_hMenu)) ; |
229 | } | |
230 | else | |
231 | { | |
4ab107d7 SC |
232 | // MacOS counts menu items from 1 and inserts after, therefore having the |
233 | // same effect as wx 0 based and inserting before, we must correct pos | |
234 | // after however for updates to be correct | |
a9412f8f | 235 | UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), wxT("a"), wxFont::GetDefaultEncoding(), pos); |
4ab107d7 | 236 | pos += 1 ; |
e40298d5 JS |
237 | } |
238 | ||
4ab107d7 | 239 | SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ; |
de5914a1 | 240 | SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (UInt32) pItem ) ; |
e40298d5 JS |
241 | pItem->UpdateItemText() ; |
242 | pItem->UpdateItemBitmap() ; | |
243 | pItem->UpdateItemStatus() ; | |
244 | ||
58751a86 | 245 | if ( pItem->GetId() == idMenuTitle ) |
e40298d5 JS |
246 | { |
247 | UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , pos , false ) ; | |
248 | } | |
249 | } | |
250 | } | |
e7549107 SC |
251 | // if we're already attached to the menubar, we must update it |
252 | if ( IsAttached() ) | |
253 | { | |
4224f059 | 254 | GetMenuBar()->Refresh(); |
e7549107 | 255 | } |
e40298d5 | 256 | return TRUE ; |
e9576ca5 SC |
257 | } |
258 | ||
7c15086c SC |
259 | void wxMenu::EndRadioGroup() |
260 | { | |
261 | // we're not inside a radio group any longer | |
262 | m_startRadioGroup = -1; | |
263 | } | |
264 | ||
9add9367 | 265 | wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) |
e9576ca5 | 266 | { |
9add9367 | 267 | wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") ); |
7c15086c SC |
268 | |
269 | bool check = FALSE; | |
270 | ||
271 | if ( item->GetKind() == wxITEM_RADIO ) | |
272 | { | |
273 | int count = GetMenuItemCount(); | |
274 | ||
275 | if ( m_startRadioGroup == -1 ) | |
276 | { | |
277 | // start a new radio group | |
278 | m_startRadioGroup = count; | |
279 | ||
280 | // for now it has just one element | |
281 | item->SetAsRadioGroupStart(); | |
282 | item->SetRadioGroupEnd(m_startRadioGroup); | |
283 | ||
284 | // ensure that we have a checked item in the radio group | |
285 | check = TRUE; | |
286 | } | |
287 | else // extend the current radio group | |
288 | { | |
289 | // we need to update its end item | |
290 | item->SetRadioGroupStart(m_startRadioGroup); | |
71f2fb52 | 291 | wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup); |
7c15086c SC |
292 | |
293 | if ( node ) | |
294 | { | |
295 | node->GetData()->SetRadioGroupEnd(count); | |
296 | } | |
297 | else | |
298 | { | |
299 | wxFAIL_MSG( _T("where is the radio group start item?") ); | |
300 | } | |
301 | } | |
302 | } | |
303 | else // not a radio item | |
304 | { | |
305 | EndRadioGroup(); | |
306 | } | |
307 | ||
308 | if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) ) | |
309 | { | |
9add9367 | 310 | return NULL; |
7c15086c SC |
311 | } |
312 | ||
313 | if ( check ) | |
314 | { | |
315 | // check the item initially | |
316 | item->Check(TRUE); | |
317 | } | |
318 | ||
9add9367 | 319 | return item; |
e9576ca5 SC |
320 | } |
321 | ||
9add9367 | 322 | wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) |
e9576ca5 | 323 | { |
9add9367 RD |
324 | if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos)) |
325 | return item; | |
326 | else | |
327 | return NULL; | |
e9576ca5 SC |
328 | } |
329 | ||
e7549107 | 330 | wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) |
e9576ca5 | 331 | { |
e7549107 SC |
332 | // we need to find the items position in the child list |
333 | size_t pos; | |
71f2fb52 | 334 | wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); |
e7549107 SC |
335 | for ( pos = 0; node; pos++ ) |
336 | { | |
337 | if ( node->GetData() == item ) | |
338 | break; | |
e9576ca5 | 339 | |
e7549107 | 340 | node = node->GetNext(); |
e9576ca5 SC |
341 | } |
342 | ||
e7549107 SC |
343 | // DoRemove() (unlike Remove) can only be called for existing item! |
344 | wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") ); | |
519cb848 | 345 | |
e40298d5 | 346 | ::DeleteMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1); |
e9576ca5 | 347 | |
e7549107 SC |
348 | if ( IsAttached() ) |
349 | { | |
7c15086c | 350 | // otherwise, the change won't be visible |
4224f059 | 351 | GetMenuBar()->Refresh(); |
e7549107 | 352 | } |
e9576ca5 | 353 | |
e7549107 SC |
354 | // and from internal data structures |
355 | return wxMenuBase::DoRemove(item); | |
e9576ca5 SC |
356 | } |
357 | ||
e9576ca5 SC |
358 | void wxMenu::SetTitle(const wxString& label) |
359 | { | |
e40298d5 | 360 | m_title = label ; |
a9412f8f | 361 | UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , label , wxFont::GetDefaultEncoding() ) ; |
e9576ca5 | 362 | } |
e7549107 | 363 | bool wxMenu::ProcessCommand(wxCommandEvent & event) |
e9576ca5 SC |
364 | { |
365 | bool processed = FALSE; | |
366 | ||
e9576ca5 SC |
367 | // Try the menu's event handler |
368 | if ( !processed && GetEventHandler()) | |
369 | { | |
e7549107 | 370 | processed = GetEventHandler()->ProcessEvent(event); |
e9576ca5 | 371 | } |
519cb848 | 372 | |
e7549107 SC |
373 | // Try the window the menu was popped up from (and up through the |
374 | // hierarchy) | |
375 | wxWindow *win = GetInvokingWindow(); | |
376 | if ( !processed && win ) | |
377 | processed = win->GetEventHandler()->ProcessEvent(event); | |
378 | ||
379 | return processed; | |
380 | } | |
381 | ||
382 | ||
383 | // --------------------------------------------------------------------------- | |
384 | // other | |
385 | // --------------------------------------------------------------------------- | |
386 | ||
e7549107 SC |
387 | wxWindow *wxMenu::GetWindow() const |
388 | { | |
389 | if ( m_invokingWindow != NULL ) | |
390 | return m_invokingWindow; | |
4224f059 DE |
391 | else if ( GetMenuBar() != NULL) |
392 | return (wxWindow *) GetMenuBar()->GetFrame(); | |
e7549107 SC |
393 | |
394 | return NULL; | |
395 | } | |
519cb848 | 396 | |
58751a86 | 397 | // helper functions returning the mac menu position for a certain item, note that this is |
519cb848 SC |
398 | // mac-wise 1 - based, i.e. the first item has index 1 whereas on MSWin it has pos 0 |
399 | ||
58751a86 | 400 | int wxMenu::MacGetIndexFromId( int id ) |
519cb848 | 401 | { |
e7549107 | 402 | size_t pos; |
71f2fb52 | 403 | wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); |
e7549107 | 404 | for ( pos = 0; node; pos++ ) |
519cb848 | 405 | { |
e7549107 SC |
406 | if ( node->GetData()->GetId() == id ) |
407 | break; | |
519cb848 | 408 | |
e7549107 SC |
409 | node = node->GetNext(); |
410 | } | |
58751a86 | 411 | |
519cb848 | 412 | if (!node) |
e40298d5 | 413 | return 0; |
58751a86 | 414 | |
e40298d5 | 415 | return pos + 1 ; |
519cb848 SC |
416 | } |
417 | ||
58751a86 | 418 | int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem ) |
519cb848 | 419 | { |
e7549107 | 420 | size_t pos; |
71f2fb52 | 421 | wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); |
e7549107 | 422 | for ( pos = 0; node; pos++ ) |
519cb848 | 423 | { |
e7549107 SC |
424 | if ( node->GetData() == pItem ) |
425 | break; | |
426 | ||
427 | node = node->GetNext(); | |
519cb848 SC |
428 | } |
429 | ||
430 | if (!node) | |
e40298d5 | 431 | return 0; |
58751a86 | 432 | |
e40298d5 | 433 | return pos + 1 ; |
519cb848 SC |
434 | } |
435 | ||
58751a86 | 436 | void wxMenu::MacEnableMenu( bool bDoEnable ) |
519cb848 | 437 | { |
e40298d5 | 438 | UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , 0 , bDoEnable ) ; |
58751a86 | 439 | |
e40298d5 | 440 | ::DrawMenuBar() ; |
519cb848 SC |
441 | } |
442 | ||
d46342af SC |
443 | // MacOS needs to know about submenus somewhere within this menu |
444 | // before it can be displayed , also hide special menu items like preferences | |
445 | // that are handled by the OS | |
58751a86 | 446 | void wxMenu::MacBeforeDisplay( bool isSubMenu ) |
d46342af SC |
447 | { |
448 | wxMenuItem* previousItem = NULL ; | |
5be55d56 | 449 | size_t pos ; |
71f2fb52 | 450 | wxMenuItemList::compatibility_iterator node; |
d46342af | 451 | wxMenuItem *item; |
58751a86 | 452 | for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) |
d46342af SC |
453 | { |
454 | item = (wxMenuItem *)node->GetData(); | |
455 | wxMenu* subMenu = item->GetSubMenu() ; | |
58751a86 | 456 | if (subMenu) |
d46342af SC |
457 | { |
458 | subMenu->MacBeforeDisplay( true ) ; | |
459 | } | |
fa4a6942 | 460 | else // normal item |
d46342af SC |
461 | { |
462 | #if TARGET_CARBON | |
463 | if ( UMAGetSystemVersion() >= 0x1000 ) | |
464 | { | |
fa4a6942 VZ |
465 | // what we do here is to hide the special items which are |
466 | // shown in the application menu anyhow -- it doesn't make | |
467 | // sense to show them in their normal place as well | |
468 | if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || | |
469 | item->GetId() == wxApp::s_macExitMenuItemId ) | |
d46342af | 470 | { |
fa4a6942 VZ |
471 | ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), |
472 | pos + 1, kMenuItemAttrHidden, 0 ); | |
473 | ||
474 | // also check for a separator which was used just to | |
475 | // separate this item from the others, so don't leave | |
476 | // separator at the menu start or end nor 2 consecutive | |
477 | // separators | |
71f2fb52 | 478 | wxMenuItemList::compatibility_iterator nextNode = node->GetNext(); |
fa4a6942 VZ |
479 | wxMenuItem *next = nextNode ? nextNode->GetData() : NULL; |
480 | ||
481 | size_t posSeptoHide; | |
482 | if ( !previousItem && next && next->IsSeparator() ) | |
483 | { | |
484 | // next (i.e. second as we must be first) item is | |
485 | // the separator to hide | |
486 | wxASSERT_MSG( pos == 0, _T("should be the menu start") ); | |
487 | posSeptoHide = 2; | |
488 | } | |
489 | else if ( GetMenuItems().GetCount() == pos + 1 && | |
490 | previousItem != NULL && | |
491 | previousItem->IsSeparator() ) | |
492 | { | |
493 | // prev item is a trailing separator we want to hide | |
494 | posSeptoHide = pos; | |
495 | } | |
496 | else if ( previousItem && previousItem->IsSeparator() && | |
497 | next && next->IsSeparator() ) | |
498 | { | |
499 | // two consecutive separators, this is one too many | |
500 | posSeptoHide = pos; | |
501 | } | |
502 | else // no separators to hide | |
503 | { | |
504 | posSeptoHide = 0; | |
505 | } | |
506 | ||
507 | if ( posSeptoHide ) | |
d46342af | 508 | { |
fa4a6942 VZ |
509 | // hide the separator as well |
510 | ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), | |
511 | posSeptoHide, | |
512 | kMenuItemAttrHidden, | |
513 | 0 ); | |
d46342af SC |
514 | } |
515 | } | |
516 | } | |
fa4a6942 | 517 | #endif // TARGET_CARBON |
d46342af SC |
518 | } |
519 | previousItem = item ; | |
520 | } | |
521 | ||
522 | if ( isSubMenu ) | |
523 | ::InsertMenu(MAC_WXHMENU( GetHMenu()), -1); | |
524 | ||
525 | } | |
526 | // undo all changes from the MacBeforeDisplay call | |
58751a86 | 527 | void wxMenu::MacAfterDisplay( bool isSubMenu ) |
d46342af SC |
528 | { |
529 | if ( isSubMenu ) | |
530 | ::DeleteMenu(MacGetMenuId()); | |
531 | ||
532 | wxMenuItem* previousItem = NULL ; | |
533 | int pos ; | |
71f2fb52 | 534 | wxMenuItemList::compatibility_iterator node; |
d46342af | 535 | wxMenuItem *item; |
58751a86 | 536 | for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) |
d46342af SC |
537 | { |
538 | item = (wxMenuItem *)node->GetData(); | |
539 | wxMenu* subMenu = item->GetSubMenu() ; | |
58751a86 | 540 | if (subMenu) |
d46342af SC |
541 | { |
542 | subMenu->MacAfterDisplay( true ) ; | |
543 | } | |
544 | else | |
545 | { | |
546 | // no need to undo hidings | |
547 | } | |
548 | previousItem = item ; | |
549 | } | |
550 | } | |
551 | ||
e9576ca5 | 552 | // Menu Bar |
519cb848 | 553 | |
58751a86 | 554 | /* |
519cb848 SC |
555 | |
556 | Mac Implementation note : | |
557 | ||
558 | The Mac has only one global menubar, so we attempt to install the currently | |
559 | active menubar from a frame, we currently don't take into account mdi-frames | |
560 | which would ask for menu-merging | |
561 | ||
58751a86 | 562 | Secondly there is no mac api for changing a menubar that is not the current |
519cb848 SC |
563 | menubar, so we have to wait for preparing the actual menubar until the |
564 | wxMenubar is to be used | |
565 | ||
58751a86 | 566 | We can in subsequent versions use MacInstallMenuBar to provide some sort of |
519cb848 SC |
567 | auto-merge for MDI in case this will be necessary |
568 | ||
569 | */ | |
570 | ||
571 | wxMenuBar* wxMenuBar::s_macInstalledMenuBar = NULL ; | |
1b1d2207 | 572 | wxMenuBar* wxMenuBar::s_macCommonMenuBar = NULL ; |
519cb848 | 573 | |
e7549107 | 574 | void wxMenuBar::Init() |
e9576ca5 SC |
575 | { |
576 | m_eventHandler = this; | |
e9576ca5 | 577 | m_menuBarFrame = NULL; |
7c15086c | 578 | m_invokingWindow = (wxWindow*) NULL; |
e9576ca5 SC |
579 | } |
580 | ||
51abe921 SC |
581 | wxMenuBar::wxMenuBar() |
582 | { | |
583 | Init(); | |
584 | } | |
585 | ||
586 | wxMenuBar::wxMenuBar( long WXUNUSED(style) ) | |
587 | { | |
588 | Init(); | |
589 | } | |
590 | ||
e7549107 SC |
591 | |
592 | wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) | |
e9576ca5 | 593 | { |
e7549107 SC |
594 | Init(); |
595 | ||
596 | m_titles.Alloc(count); | |
597 | ||
598 | for ( int i = 0; i < count; i++ ) | |
599 | { | |
600 | m_menus.Append(menus[i]); | |
601 | m_titles.Add(titles[i]); | |
602 | ||
603 | menus[i]->Attach(this); | |
604 | } | |
e9576ca5 SC |
605 | } |
606 | ||
607 | wxMenuBar::~wxMenuBar() | |
608 | { | |
1b1d2207 DE |
609 | if (s_macCommonMenuBar == this) |
610 | s_macCommonMenuBar = NULL; | |
e40298d5 JS |
611 | if (s_macInstalledMenuBar == this) |
612 | { | |
613 | ::ClearMenuBar(); | |
614 | s_macInstalledMenuBar = NULL; | |
615 | } | |
519cb848 | 616 | |
e7549107 SC |
617 | } |
618 | ||
6d6da89c | 619 | void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect)) |
e7549107 SC |
620 | { |
621 | wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") ); | |
e9576ca5 | 622 | |
e7549107 | 623 | DrawMenuBar(); |
e9576ca5 SC |
624 | } |
625 | ||
58751a86 | 626 | void wxMenuBar::MacInstallMenuBar() |
519cb848 | 627 | { |
2b8a6962 GD |
628 | if ( s_macInstalledMenuBar == this ) |
629 | return ; | |
58751a86 | 630 | |
53d92341 SC |
631 | MenuBarHandle menubar = NULL ; |
632 | #if TARGET_API_MAC_OSX | |
633 | menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ; | |
634 | #else | |
635 | menubar = NewHandleClear( 12 ) ; | |
636 | (*menubar)[3] = 0x0a ; | |
637 | #endif | |
2b8a6962 | 638 | ::SetMenuBar( menubar ) ; |
dd05f811 | 639 | DisposeMenuBar( menubar ) ; |
cda73c27 SC |
640 | MenuHandle appleMenu = NULL ; |
641 | char appleMenuTitle[3] = { 01 , kMenuAppleLogoFilledGlyph , 0 } ; | |
642 | ||
643 | verify_noerr( CreateNewMenu( kwxMacAppleMenuId , 0 , &appleMenu ) ) ; | |
644 | verify_noerr( SetMenuTitle( appleMenu , (ConstStr255Param) appleMenuTitle ) ); | |
23c6ddc8 | 645 | |
262ce38a KH |
646 | // Add About/Preferences separator only on OS X |
647 | // KH/RN: Separator is always present on 10.3 but not on 10.2 | |
648 | // However, the change from 10.2 to 10.3 suggests it is preferred | |
649 | #if TARGET_API_MAC_OSX | |
e957d41c | 650 | MacInsertMenuItem( appleMenu , "\p-" , 0 ) ; |
262ce38a KH |
651 | #endif |
652 | ||
cda73c27 SC |
653 | MacInsertMenuItem( appleMenu , "\pAbout..." , 0 ) ; |
654 | MacInsertMenu( appleMenu , 0 ) ; | |
655 | ||
7c15086c | 656 | // clean-up the help menu before adding new items |
e40298d5 JS |
657 | MenuHandle mh = NULL ; |
658 | if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr ) | |
659 | { | |
660 | for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i ) | |
661 | { | |
662 | DeleteMenuItem( mh , i ) ; | |
663 | } | |
664 | } | |
665 | else | |
666 | { | |
667 | mh = NULL ; | |
668 | } | |
7c15086c | 669 | #if TARGET_CARBON |
e40298d5 JS |
670 | if ( UMAGetSystemVersion() >= 0x1000 && wxApp::s_macPreferencesMenuItemId) |
671 | { | |
672 | wxMenuItem *item = FindItem( wxApp::s_macPreferencesMenuItemId , NULL ) ; | |
673 | if ( item == NULL || !(item->IsEnabled()) ) | |
674 | DisableMenuCommand( NULL , kHICommandPreferences ) ; | |
675 | else | |
676 | EnableMenuCommand( NULL , kHICommandPreferences ) ; | |
677 | } | |
7c15086c | 678 | #endif |
71f2fb52 RN |
679 | wxMenuList::compatibility_iterator menuIter = m_menus.GetFirst(); |
680 | // | |
681 | for (size_t i = 0; i < m_menus.GetCount(); i++, menuIter = menuIter->GetNext()) | |
e40298d5 | 682 | { |
71f2fb52 | 683 | wxMenuItemList::compatibility_iterator node; |
2b5f62a0 VZ |
684 | wxMenuItem *item; |
685 | int pos ; | |
71f2fb52 | 686 | wxMenu* menu = menuIter->GetData() , *subMenu = NULL ; |
e40298d5 | 687 | |
427ff662 | 688 | if( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?") || m_titles[i] == wxApp::s_macHelpMenuTitleName ) |
e40298d5 JS |
689 | { |
690 | if ( mh == NULL ) | |
691 | { | |
692 | continue ; | |
693 | } | |
58751a86 RD |
694 | |
695 | for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) | |
e40298d5 JS |
696 | { |
697 | item = (wxMenuItem *)node->GetData(); | |
698 | subMenu = item->GetSubMenu() ; | |
58751a86 | 699 | if (subMenu) |
e40298d5 JS |
700 | { |
701 | // we don't support hierarchical menus in the help menu yet | |
702 | } | |
58751a86 | 703 | else |
e40298d5 JS |
704 | { |
705 | if ( item->IsSeparator() ) | |
706 | { | |
707 | if ( mh ) | |
708 | MacAppendMenu(mh, "\p-" ); | |
709 | } | |
710 | else | |
711 | { | |
712 | wxAcceleratorEntry* entry = wxGetAccelFromString( item->GetText() ) ; | |
713 | ||
714 | if ( item->GetId() == wxApp::s_macAboutMenuItemId ) | |
58751a86 | 715 | { |
a9412f8f | 716 | UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetText() , wxFont::GetDefaultEncoding() ); |
e40298d5 JS |
717 | UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true ); |
718 | SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ; | |
de5914a1 | 719 | SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)item ) ; |
e40298d5 JS |
720 | UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ; |
721 | } | |
722 | else | |
723 | { | |
724 | if ( mh ) | |
725 | { | |
a9412f8f | 726 | UMAAppendMenuItem(mh, item->GetText() , wxFont::GetDefaultEncoding(), entry); |
e40298d5 | 727 | SetMenuItemCommandID( mh , CountMenuItems(mh) , item->GetId() ) ; |
de5914a1 | 728 | SetMenuItemRefCon( mh , CountMenuItems(mh) , (UInt32)item ) ; |
e40298d5 JS |
729 | } |
730 | } | |
58751a86 | 731 | |
e40298d5 JS |
732 | delete entry ; |
733 | } | |
734 | } | |
735 | } | |
736 | } | |
737 | else | |
738 | { | |
a9412f8f | 739 | UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i], m_font.GetEncoding() ) ; |
71f2fb52 RN |
740 | menu->MacBeforeDisplay(false) ; |
741 | ::InsertMenu(MAC_WXHMENU(_wxMenuAt(m_menus, i)->GetHMenu()), 0); | |
e40298d5 JS |
742 | } |
743 | } | |
744 | ::DrawMenuBar() ; | |
745 | s_macInstalledMenuBar = this; | |
519cb848 SC |
746 | } |
747 | ||
e7549107 | 748 | void wxMenuBar::EnableTop(size_t pos, bool enable) |
e9576ca5 | 749 | { |
e7549107 | 750 | wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") ); |
71f2fb52 | 751 | _wxMenuAt(m_menus, pos)->MacEnableMenu( enable ) ; |
e7549107 | 752 | Refresh(); |
e9576ca5 SC |
753 | } |
754 | ||
c393c740 JS |
755 | bool wxMenuBar::Enable( bool enable) |
756 | { | |
5059f192 | 757 | wxCHECK_MSG( IsAttached(), false, wxT("doesn't work with unattached menubars") ); |
c393c740 JS |
758 | size_t i; |
759 | for (i = 0; i < GetMenuCount(); i++) | |
760 | { | |
761 | EnableTop(i, enable); | |
762 | } | |
763 | return true; | |
764 | } | |
765 | ||
e7549107 | 766 | void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) |
e9576ca5 | 767 | { |
e7549107 | 768 | wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); |
e9576ca5 | 769 | |
e7549107 | 770 | m_titles[pos] = label; |
e9576ca5 | 771 | |
e7549107 SC |
772 | if ( !IsAttached() ) |
773 | { | |
e9576ca5 | 774 | return; |
e7549107 | 775 | } |
e9576ca5 | 776 | |
71f2fb52 RN |
777 | _wxMenuAt(m_menus, pos)->SetTitle( label ) ; |
778 | ||
e40298d5 JS |
779 | if (wxMenuBar::s_macInstalledMenuBar == this) // are we currently installed ? |
780 | { | |
781 | ::SetMenuBar( GetMenuBar() ) ; | |
782 | ::InvalMenuBar() ; | |
783 | } | |
e9576ca5 SC |
784 | } |
785 | ||
e7549107 | 786 | wxString wxMenuBar::GetLabelTop(size_t pos) const |
e9576ca5 | 787 | { |
e7549107 SC |
788 | wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, |
789 | wxT("invalid menu index in wxMenuBar::GetLabelTop") ); | |
519cb848 | 790 | |
e7549107 | 791 | return m_titles[pos]; |
e9576ca5 SC |
792 | } |
793 | ||
e7549107 | 794 | int wxMenuBar::FindMenu(const wxString& title) |
e9576ca5 | 795 | { |
e7549107 | 796 | wxString menuTitle = wxStripMenuCodes(title); |
e9576ca5 | 797 | |
e7549107 SC |
798 | size_t count = GetMenuCount(); |
799 | for ( size_t i = 0; i < count; i++ ) | |
e9576ca5 | 800 | { |
e7549107 SC |
801 | wxString title = wxStripMenuCodes(m_titles[i]); |
802 | if ( menuTitle == title ) | |
58751a86 | 803 | return i; |
e9576ca5 | 804 | } |
e9576ca5 | 805 | |
e7549107 | 806 | return wxNOT_FOUND; |
e9576ca5 | 807 | |
e9576ca5 SC |
808 | } |
809 | ||
e7549107 | 810 | |
e7549107 SC |
811 | // --------------------------------------------------------------------------- |
812 | // wxMenuBar construction | |
813 | // --------------------------------------------------------------------------- | |
814 | ||
815 | wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) | |
e9576ca5 | 816 | { |
e7549107 SC |
817 | wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title); |
818 | if ( !menuOld ) | |
819 | return FALSE; | |
820 | m_titles[pos] = title; | |
e9576ca5 | 821 | |
e7549107 | 822 | if ( IsAttached() ) |
e9576ca5 | 823 | { |
e40298d5 JS |
824 | if (s_macInstalledMenuBar == this) |
825 | { | |
d46342af | 826 | menuOld->MacAfterDisplay( false ) ; |
e40298d5 JS |
827 | ::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ; |
828 | { | |
d46342af | 829 | menu->MacBeforeDisplay( false ) ; |
a9412f8f | 830 | UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ; |
e40298d5 JS |
831 | if ( pos == m_menus.GetCount() - 1) |
832 | { | |
833 | ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; | |
834 | } | |
835 | else | |
836 | { | |
71f2fb52 | 837 | ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , _wxMenuAt(m_menus, pos+1)->MacGetMenuId() ) ; |
e40298d5 JS |
838 | } |
839 | } | |
840 | } | |
e9576ca5 | 841 | |
e7549107 | 842 | Refresh(); |
e9576ca5 | 843 | } |
0f4c4140 SC |
844 | if (m_invokingWindow) |
845 | wxMenubarSetInvokingWindow( menu, m_invokingWindow ); | |
e9576ca5 | 846 | |
e7549107 | 847 | return menuOld; |
e9576ca5 SC |
848 | } |
849 | ||
e7549107 | 850 | bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) |
e9576ca5 | 851 | { |
e7549107 SC |
852 | if ( !wxMenuBarBase::Insert(pos, menu, title) ) |
853 | return FALSE; | |
e9576ca5 | 854 | |
e7549107 | 855 | m_titles.Insert(title, pos); |
e9576ca5 | 856 | |
a9412f8f | 857 | UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ; |
e7549107 | 858 | |
d46342af | 859 | if ( IsAttached() && s_macInstalledMenuBar == this ) |
e9576ca5 | 860 | { |
d46342af | 861 | if (s_macInstalledMenuBar == this) |
e40298d5 | 862 | { |
d46342af SC |
863 | menu->MacBeforeDisplay( false ) ; |
864 | if ( pos == (size_t) -1 || pos + 1 == m_menus.GetCount() ) | |
865 | { | |
866 | ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; | |
867 | } | |
868 | else | |
869 | { | |
71f2fb52 | 870 | ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , _wxMenuAt(m_menus, pos+1)->MacGetMenuId() ) ; |
d46342af | 871 | } |
e40298d5 | 872 | } |
e7549107 | 873 | Refresh(); |
e9576ca5 | 874 | } |
0f4c4140 SC |
875 | if (m_invokingWindow) |
876 | wxMenubarSetInvokingWindow( menu, m_invokingWindow ); | |
e7549107 SC |
877 | |
878 | return TRUE; | |
e9576ca5 SC |
879 | } |
880 | ||
51abe921 SC |
881 | wxMenu *wxMenuBar::Remove(size_t pos) |
882 | { | |
883 | wxMenu *menu = wxMenuBarBase::Remove(pos); | |
884 | if ( !menu ) | |
885 | return NULL; | |
886 | ||
887 | if ( IsAttached() ) | |
888 | { | |
e40298d5 JS |
889 | if (s_macInstalledMenuBar == this) |
890 | { | |
891 | ::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ; | |
892 | } | |
51abe921 | 893 | |
51abe921 SC |
894 | Refresh(); |
895 | } | |
896 | ||
5fe38474 | 897 | m_titles.RemoveAt(pos); |
51abe921 SC |
898 | |
899 | return menu; | |
900 | } | |
901 | ||
902 | bool wxMenuBar::Append(wxMenu *menu, const wxString& title) | |
903 | { | |
904 | WXHMENU submenu = menu ? menu->GetHMenu() : 0; | |
905 | wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") ); | |
906 | ||
907 | if ( !wxMenuBarBase::Append(menu, title) ) | |
908 | return FALSE; | |
909 | ||
51abe921 | 910 | m_titles.Add(title); |
58751a86 | 911 | |
a9412f8f | 912 | UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ; |
51abe921 SC |
913 | |
914 | if ( IsAttached() ) | |
915 | { | |
e40298d5 JS |
916 | if (s_macInstalledMenuBar == this) |
917 | { | |
94c80d52 | 918 | menu->MacBeforeDisplay( false ) ; |
e40298d5 JS |
919 | ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; |
920 | } | |
51abe921 SC |
921 | |
922 | Refresh(); | |
923 | } | |
924 | ||
0f4c4140 | 925 | // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables |
7c15086c SC |
926 | // adding menu later on. |
927 | if (m_invokingWindow) | |
928 | wxMenubarSetInvokingWindow( menu, m_invokingWindow ); | |
929 | ||
51abe921 SC |
930 | return TRUE; |
931 | } | |
932 | ||
2b5f62a0 VZ |
933 | static void wxMenubarUnsetInvokingWindow( wxMenu *menu ) |
934 | { | |
935 | menu->SetInvokingWindow( (wxWindow*) NULL ); | |
936 | ||
71f2fb52 | 937 | wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); |
2b5f62a0 VZ |
938 | while (node) |
939 | { | |
940 | wxMenuItem *menuitem = node->GetData(); | |
941 | if (menuitem->IsSubMenu()) | |
942 | wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu() ); | |
943 | node = node->GetNext(); | |
944 | } | |
945 | } | |
946 | ||
947 | static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) | |
948 | { | |
949 | menu->SetInvokingWindow( win ); | |
950 | ||
71f2fb52 | 951 | wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); |
2b5f62a0 VZ |
952 | while (node) |
953 | { | |
954 | wxMenuItem *menuitem = node->GetData(); | |
955 | if (menuitem->IsSubMenu()) | |
956 | wxMenubarSetInvokingWindow( menuitem->GetSubMenu() , win ); | |
957 | node = node->GetNext(); | |
958 | } | |
959 | } | |
960 | ||
961 | void wxMenuBar::UnsetInvokingWindow() | |
962 | { | |
7c15086c | 963 | m_invokingWindow = (wxWindow*) NULL; |
71f2fb52 | 964 | wxMenuList::compatibility_iterator node = m_menus.GetFirst(); |
2b5f62a0 VZ |
965 | while (node) |
966 | { | |
967 | wxMenu *menu = node->GetData(); | |
968 | wxMenubarUnsetInvokingWindow( menu ); | |
969 | node = node->GetNext(); | |
970 | } | |
971 | } | |
972 | ||
973 | void wxMenuBar::SetInvokingWindow(wxFrame *frame) | |
974 | { | |
7c15086c | 975 | m_invokingWindow = frame; |
71f2fb52 | 976 | wxMenuList::compatibility_iterator node = m_menus.GetFirst(); |
2b5f62a0 VZ |
977 | while (node) |
978 | { | |
979 | wxMenu *menu = node->GetData(); | |
980 | wxMenubarSetInvokingWindow( menu, frame ); | |
981 | node = node->GetNext(); | |
982 | } | |
983 | } | |
984 | ||
90b959ae | 985 | void wxMenuBar::Detach() |
2f1ae414 | 986 | { |
90b959ae SC |
987 | wxMenuBarBase::Detach() ; |
988 | } | |
2f1ae414 | 989 | |
90b959ae SC |
990 | void wxMenuBar::Attach(wxFrame *frame) |
991 | { | |
992 | wxMenuBarBase::Attach( frame ) ; | |
2f1ae414 | 993 | } |
51abe921 SC |
994 | // --------------------------------------------------------------------------- |
995 | // wxMenuBar searching for menu items | |
996 | // --------------------------------------------------------------------------- | |
997 | ||
998 | // Find the itemString in menuString, and return the item id or wxNOT_FOUND | |
999 | int wxMenuBar::FindMenuItem(const wxString& menuString, | |
1000 | const wxString& itemString) const | |
1001 | { | |
1002 | wxString menuLabel = wxStripMenuCodes(menuString); | |
1003 | size_t count = GetMenuCount(); | |
1004 | for ( size_t i = 0; i < count; i++ ) | |
1005 | { | |
1006 | wxString title = wxStripMenuCodes(m_titles[i]); | |
ef089805 | 1007 | if ( menuLabel == title ) |
71f2fb52 | 1008 | return _wxMenuAt(m_menus, i)->FindItem(itemString); |
51abe921 SC |
1009 | } |
1010 | ||
1011 | return wxNOT_FOUND; | |
1012 | } | |
1013 | ||
1014 | wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const | |
1015 | { | |
1016 | if ( itemMenu ) | |
1017 | *itemMenu = NULL; | |
1018 | ||
1019 | wxMenuItem *item = NULL; | |
1020 | size_t count = GetMenuCount(); | |
1021 | for ( size_t i = 0; !item && (i < count); i++ ) | |
1022 | { | |
71f2fb52 | 1023 | item = _wxMenuAt(m_menus, i)->FindItem(id, itemMenu); |
51abe921 SC |
1024 | } |
1025 | ||
1026 | return item; | |
1027 | } | |
1028 | ||
1029 |