]> git.saurik.com Git - wxWidgets.git/blame - src/msw/menu.cpp
Added missing textctrl.h include
[wxWidgets.git] / src / msw / menu.cpp
CommitLineData
2bda0e17
KB
1/////////////////////////////////////////////////////////////////////////////
2// Name: menu.cpp
3// Purpose: wxMenu, wxMenuBar, wxMenuItem
4// Author: Julian Smart
5// Modified by: Vadim Zeitlin
6// Created: 04/01/98
7// RCS-ID: $Id$
6c9a19aa
JS
8// Copyright: (c) Julian Smart
9// Licence: wxWindows licence
2bda0e17
KB
10/////////////////////////////////////////////////////////////////////////////
11
c2dcfdef
VZ
12// ===========================================================================
13// declarations
14// ===========================================================================
15
16// ---------------------------------------------------------------------------
17// headers
18// ---------------------------------------------------------------------------
19
14f355c2 20#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
c626a8b7 21 #pragma implementation "menu.h"
2bda0e17
KB
22#endif
23
24// For compilers that support precompilation, includes "wx.h".
25#include "wx/wxprec.h"
26
27#ifdef __BORLANDC__
c626a8b7 28 #pragma hdrstop
2bda0e17
KB
29#endif
30
1e6feb95
VZ
31#if wxUSE_MENUS
32
2bda0e17 33#ifndef WX_PRECOMP
c626a8b7
VZ
34 #include "wx/frame.h"
35 #include "wx/menu.h"
36 #include "wx/utils.h"
0c589ad0 37 #include "wx/intl.h"
717a57c2 38 #include "wx/log.h"
2bda0e17
KB
39#endif
40
47d67540 41#if wxUSE_OWNER_DRAWN
c626a8b7 42 #include "wx/ownerdrw.h"
2bda0e17
KB
43#endif
44
45#include "wx/msw/private.h"
2bda0e17 46
39d2f9a7
JS
47#ifdef __WXWINCE__
48#include <windows.h>
49#include <windowsx.h>
50#include <tchar.h>
51#include <ole2.h>
eae4425d 52#include <shellapi.h>
39d2f9a7 53#include <commctrl.h>
2d36b3d8 54#if _WIN32_WCE < 400
39d2f9a7 55#include <aygshell.h>
39d2f9a7
JS
56#endif
57
2d36b3d8
JS
58#include "wx/msw/wince/missing.h"
59
39d2f9a7
JS
60#endif
61
2bda0e17 62// other standard headers
2bda0e17
KB
63#include <string.h>
64
c626a8b7
VZ
65// ----------------------------------------------------------------------------
66// global variables
67// ----------------------------------------------------------------------------
68
69extern wxMenu *wxCurrentPopupMenu;
70
b8d3a4f1
VZ
71// ----------------------------------------------------------------------------
72// constants
73// ----------------------------------------------------------------------------
74
75// the (popup) menu title has this special id
c25f373e 76static const int idMenuTitle = -3;
b8d3a4f1
VZ
77
78// ----------------------------------------------------------------------------
0472ece7 79// private functions
b8d3a4f1 80// ----------------------------------------------------------------------------
c626a8b7 81
0472ece7
VZ
82// make the given menu item default
83static void SetDefaultMenuItem(HMENU hmenu, UINT id)
84{
4676948b 85#ifndef __WXWINCE__
0472ece7
VZ
86 MENUITEMINFO mii;
87 wxZeroMemory(mii);
88 mii.cbSize = sizeof(MENUITEMINFO);
89 mii.fMask = MIIM_STATE;
90 mii.fState = MFS_DEFAULT;
91
92 if ( !::SetMenuItemInfo(hmenu, id, FALSE, &mii) )
93 {
94 wxLogLastError(wxT("SetMenuItemInfo"));
95 }
4676948b
JS
96#endif
97}
98
99#ifdef __WXWINCE__
100UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
101{
102 MENUITEMINFO info;
103 wxZeroMemory(info);
104 info.cbSize = sizeof(info);
105 info.fMask = MIIM_STATE;
106 if ( !GetMenuItemInfo(hMenu, id, flags & MF_BYCOMMAND ? FALSE : TRUE, & info) )
107 wxLogLastError(wxT("GetMenuItemInfo"));
108 return info.fState;
0472ece7 109}
4676948b 110#endif
2bda0e17
KB
111
112// ============================================================================
113// implementation
114// ============================================================================
115
e70b4f10
SC
116#include <wx/listimpl.cpp>
117
118WX_DEFINE_LIST( wxMenuInfoList ) ;
119
120#if wxUSE_EXTENDED_RTTI
121
122WX_DEFINE_FLAGS( wxMenuStyle )
123
3ff066a4
SC
124wxBEGIN_FLAGS( wxMenuStyle )
125 wxFLAGS_MEMBER(wxMENU_TEAROFF)
126wxEND_FLAGS( wxMenuStyle )
e70b4f10
SC
127
128IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler,"wx/menu.h")
129
3ff066a4 130wxCOLLECTION_TYPE_INFO( wxMenuItem * , wxMenuItemList ) ;
e70b4f10
SC
131
132template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVariantArray &value)
133{
134 wxListCollectionToVariantArray<wxMenuItemList::compatibility_iterator>( theList , value ) ;
135}
136
3ff066a4
SC
137wxBEGIN_PROPERTIES_TABLE(wxMenu)
138 wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
139 wxPROPERTY( Title, wxString , SetTitle, GetTitle, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
af498247 140 wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
3ff066a4
SC
141 wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
142wxEND_PROPERTIES_TABLE()
e70b4f10 143
3ff066a4
SC
144wxBEGIN_HANDLERS_TABLE(wxMenu)
145wxEND_HANDLERS_TABLE()
e70b4f10 146
3ff066a4 147wxDIRECT_CONSTRUCTOR_2( wxMenu , wxString , Title , long , MenuStyle )
e70b4f10
SC
148
149WX_DEFINE_FLAGS( wxMenuBarStyle )
150
3ff066a4
SC
151wxBEGIN_FLAGS( wxMenuBarStyle )
152 wxFLAGS_MEMBER(wxMB_DOCKABLE)
153wxEND_FLAGS( wxMenuBarStyle )
e70b4f10
SC
154
155// the negative id would lead the window (its superclass !) to vetoe streaming out otherwise
2341cf5f 156bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxWriter * , wxPersister * , wxxVariantArray & )
e70b4f10
SC
157{
158 return true ;
159}
160
161IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow ,"wx/menu.h",wxMenuBarStreamingCallback)
162
163IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject , "wx/menu.h" )
164
3ff066a4 165wxBEGIN_PROPERTIES_TABLE(wxMenuInfo)
af498247 166 wxREADONLY_PROPERTY( Menu , wxMenu* , GetMenu , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
3ff066a4
SC
167 wxREADONLY_PROPERTY( Title , wxString , GetTitle , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
168wxEND_PROPERTIES_TABLE()
e70b4f10 169
3ff066a4
SC
170wxBEGIN_HANDLERS_TABLE(wxMenuInfo)
171wxEND_HANDLERS_TABLE()
e70b4f10 172
3ff066a4 173wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title )
e70b4f10 174
3ff066a4 175wxCOLLECTION_TYPE_INFO( wxMenuInfo * , wxMenuInfoList ) ;
e70b4f10
SC
176
177template<> void wxCollectionToVariantArray( wxMenuInfoList const &theList, wxxVariantArray &value)
178{
179 wxListCollectionToVariantArray<wxMenuInfoList::compatibility_iterator>( theList , value ) ;
180}
181
3ff066a4
SC
182wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
183 wxPROPERTY_COLLECTION( MenuInfos , wxMenuInfoList , wxMenuInfo* , Append , GetMenuInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
184wxEND_PROPERTIES_TABLE()
e70b4f10 185
3ff066a4
SC
186wxBEGIN_HANDLERS_TABLE(wxMenuBar)
187wxEND_HANDLERS_TABLE()
e70b4f10 188
3ff066a4 189wxCONSTRUCTOR_DUMMY( wxMenuBar )
e70b4f10
SC
190
191#else
0472ece7
VZ
192IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
193IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
e70b4f10
SC
194IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject)
195#endif
0472ece7 196
e70b4f10
SC
197const wxMenuInfoList& wxMenuBar::GetMenuInfos() const
198{
199 wxMenuInfoList* list = const_cast< wxMenuInfoList* >( &m_menuInfos ) ;
200 WX_CLEAR_LIST( wxMenuInfoList , *list ) ;
201 for( size_t i = 0 ; i < GetMenuCount() ; ++i )
202 {
203 wxMenuInfo* info = new wxMenuInfo() ;
204 info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetLabelTop(i) ) ;
205 list->Append( info ) ;
206 }
207 return m_menuInfos ;
208}
066f1b7a 209
c2dcfdef
VZ
210// ---------------------------------------------------------------------------
211// wxMenu construction, adding and removing menu items
212// ---------------------------------------------------------------------------
2bda0e17
KB
213
214// Construct a menu with optional title (then use append)
717a57c2 215void wxMenu::Init()
c626a8b7 216{
ad9bb75f 217 m_doBreak = FALSE;
0472ece7 218 m_startRadioGroup = -1;
c626a8b7 219
717a57c2
VZ
220 // create the menu
221 m_hMenu = (WXHMENU)CreatePopupMenu();
222 if ( !m_hMenu )
223 {
f6bcfd97 224 wxLogLastError(wxT("CreatePopupMenu"));
717a57c2
VZ
225 }
226
227 // if we have a title, insert it in the beginning of the menu
c626a8b7
VZ
228 if ( !!m_title )
229 {
ad9bb75f
VZ
230 Append(idMenuTitle, m_title);
231 AppendSeparator();
c626a8b7 232 }
2bda0e17
KB
233}
234
235// The wxWindow destructor will take care of deleting the submenus.
b8d3a4f1 236wxMenu::~wxMenu()
2bda0e17 237{
717a57c2
VZ
238 // we should free Windows resources only if Windows doesn't do it for us
239 // which happens if we're attached to a menubar or a submenu of another
240 // menu
241 if ( !IsAttached() && !GetParent() )
c2dcfdef 242 {
ad9bb75f
VZ
243 if ( !::DestroyMenu(GetHmenu()) )
244 {
f6bcfd97 245 wxLogLastError(wxT("DestroyMenu"));
ad9bb75f 246 }
c2dcfdef 247 }
c626a8b7 248
ad9bb75f
VZ
249#if wxUSE_ACCEL
250 // delete accels
251 WX_CLEAR_ARRAY(m_accels);
252#endif // wxUSE_ACCEL
2bda0e17
KB
253}
254
b8d3a4f1 255void wxMenu::Break()
2bda0e17 256{
717a57c2 257 // this will take effect during the next call to Append()
c2dcfdef 258 m_doBreak = TRUE;
2bda0e17
KB
259}
260
0472ece7
VZ
261void wxMenu::Attach(wxMenuBarBase *menubar)
262{
263 wxMenuBase::Attach(menubar);
264
265 EndRadioGroup();
266}
267
717a57c2
VZ
268#if wxUSE_ACCEL
269
270int wxMenu::FindAccel(int id) const
271{
272 size_t n, count = m_accels.GetCount();
273 for ( n = 0; n < count; n++ )
274 {
275 if ( m_accels[n]->m_command == id )
276 return n;
277 }
278
279 return wxNOT_FOUND;
280}
281
282void wxMenu::UpdateAccel(wxMenuItem *item)
2bda0e17 283{
f6bcfd97 284 if ( item->IsSubMenu() )
717a57c2 285 {
f6bcfd97 286 wxMenu *submenu = item->GetSubMenu();
222ed1d6 287 wxMenuItemList::compatibility_iterator node = submenu->GetMenuItems().GetFirst();
f6bcfd97
BP
288 while ( node )
289 {
290 UpdateAccel(node->GetData());
291
292 node = node->GetNext();
293 }
717a57c2 294 }
f6bcfd97 295 else if ( !item->IsSeparator() )
717a57c2 296 {
f6bcfd97
BP
297 // find the (new) accel for this item
298 wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText());
717a57c2 299 if ( accel )
f6bcfd97
BP
300 accel->m_command = item->GetId();
301
302 // find the old one
303 int n = FindAccel(item->GetId());
304 if ( n == wxNOT_FOUND )
305 {
306 // no old, add new if any
307 if ( accel )
308 m_accels.Add(accel);
309 else
310 return; // skipping RebuildAccelTable() below
311 }
717a57c2 312 else
f6bcfd97
BP
313 {
314 // replace old with new or just remove the old one if no new
315 delete m_accels[n];
316 if ( accel )
317 m_accels[n] = accel;
318 else
b54e41c5 319 m_accels.RemoveAt(n);
f6bcfd97 320 }
717a57c2 321
f6bcfd97
BP
322 if ( IsAttached() )
323 {
4224f059 324 GetMenuBar()->RebuildAccelTable();
f6bcfd97 325 }
42e69d6b 326 }
f6bcfd97 327 //else: it is a separator, they can't have accels, nothing to do
717a57c2
VZ
328}
329
330#endif // wxUSE_ACCEL
331
332// append a new item or submenu to the menu
333bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
334{
335#if wxUSE_ACCEL
336 UpdateAccel(pItem);
d427503c 337#endif // wxUSE_ACCEL
42e69d6b 338
c626a8b7 339 UINT flags = 0;
2bda0e17 340
c2dcfdef
VZ
341 // if "Break" has just been called, insert a menu break before this item
342 // (and don't forget to reset the flag)
c626a8b7
VZ
343 if ( m_doBreak ) {
344 flags |= MF_MENUBREAK;
345 m_doBreak = FALSE;
346 }
347
348 if ( pItem->IsSeparator() ) {
349 flags |= MF_SEPARATOR;
350 }
2bda0e17 351
c2dcfdef
VZ
352 // id is the numeric id for normal menu items and HMENU for submenus as
353 // required by ::AppendMenu() API
c626a8b7 354 UINT id;
c2dcfdef
VZ
355 wxMenu *submenu = pItem->GetSubMenu();
356 if ( submenu != NULL ) {
717a57c2
VZ
357 wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") );
358
359 submenu->SetParent(this);
2bda0e17 360
c2dcfdef 361 id = (UINT)submenu->GetHMenu();
2bda0e17 362
c626a8b7
VZ
363 flags |= MF_POPUP;
364 }
365 else {
366 id = pItem->GetId();
367 }
2bda0e17 368
39d2f9a7
JS
369#ifdef __WXWINCE__
370 wxString strippedString;
371#endif
372
837e5743 373 LPCTSTR pData;
2bda0e17 374
47d67540 375#if wxUSE_OWNER_DRAWN
c626a8b7
VZ
376 if ( pItem->IsOwnerDrawn() ) { // want to get {Measure|Draw}Item messages?
377 // item draws itself, pass pointer to it in data parameter
378 flags |= MF_OWNERDRAW;
837e5743 379 pData = (LPCTSTR)pItem;
c626a8b7
VZ
380 }
381 else
2bda0e17 382#endif
c626a8b7
VZ
383 {
384 // menu is just a normal string (passed in data parameter)
385 flags |= MF_STRING;
8fb3a512 386
39d2f9a7
JS
387#ifdef __WXWINCE__
388 strippedString = wxStripMenuCodes(pItem->GetText());
389 pData = (wxChar*)strippedString.c_str();
390#else
f5166ed4 391 pData = (wxChar*)pItem->GetText().c_str();
39d2f9a7 392#endif
c626a8b7 393 }
2bda0e17 394
717a57c2
VZ
395 BOOL ok;
396 if ( pos == (size_t)-1 )
397 {
398 ok = ::AppendMenu(GetHmenu(), flags, id, pData);
399 }
400 else
401 {
402 ok = ::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData);
403 }
404
405 if ( !ok )
c626a8b7 406 {
f6bcfd97 407 wxLogLastError(wxT("Insert or AppendMenu"));
717a57c2
VZ
408
409 return FALSE;
c626a8b7 410 }
42e69d6b 411
0472ece7
VZ
412 // if we just appended the title, highlight it
413#ifdef __WIN32__
414 if ( (int)id == idMenuTitle )
415 {
416 // visually select the menu title
417 SetDefaultMenuItem(GetHmenu(), id);
418 }
42e69d6b
VZ
419#endif // __WIN32__
420
0472ece7 421 // if we're already attached to the menubar, we must update it
4224f059 422 if ( IsAttached() && GetMenuBar()->IsAttached() )
0472ece7 423 {
4224f059 424 GetMenuBar()->Refresh();
0472ece7
VZ
425 }
426
427 return TRUE;
428}
429
430void wxMenu::EndRadioGroup()
431{
0472ece7
VZ
432 // we're not inside a radio group any longer
433 m_startRadioGroup = -1;
2bda0e17
KB
434}
435
9add9367 436wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
2bda0e17 437{
9add9367 438 wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
0472ece7 439
be15b995
VZ
440 bool check = FALSE;
441
546bfbea 442 if ( item->GetKind() == wxITEM_RADIO )
0472ece7 443 {
be15b995
VZ
444 int count = GetMenuItemCount();
445
0472ece7
VZ
446 if ( m_startRadioGroup == -1 )
447 {
448 // start a new radio group
be15b995
VZ
449 m_startRadioGroup = count;
450
451 // for now it has just one element
452 item->SetAsRadioGroupStart();
453 item->SetRadioGroupEnd(m_startRadioGroup);
454
455 // ensure that we have a checked item in the radio group
456 check = TRUE;
457 }
458 else // extend the current radio group
459 {
460 // we need to update its end item
461 item->SetRadioGroupStart(m_startRadioGroup);
222ed1d6 462 wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
be15b995
VZ
463
464 if ( node )
465 {
466 node->GetData()->SetRadioGroupEnd(count);
467 }
468 else
469 {
470 wxFAIL_MSG( _T("where is the radio group start item?") );
471 }
0472ece7
VZ
472 }
473 }
474 else // not a radio item
475 {
476 EndRadioGroup();
477 }
478
be15b995
VZ
479 if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
480 {
9add9367 481 return NULL;
be15b995
VZ
482 }
483
484 if ( check )
485 {
486 // check the item initially
487 item->Check(TRUE);
488 }
489
9add9367 490 return item;
2bda0e17
KB
491}
492
9add9367 493wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
2bda0e17 494{
9add9367
RD
495 if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos))
496 return item;
497 else
498 return NULL;
2bda0e17
KB
499}
500
717a57c2 501wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
2bda0e17 502{
717a57c2
VZ
503 // we need to find the items position in the child list
504 size_t pos;
222ed1d6 505 wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
717a57c2 506 for ( pos = 0; node; pos++ )
c626a8b7 507 {
717a57c2 508 if ( node->GetData() == item )
c626a8b7 509 break;
717a57c2
VZ
510
511 node = node->GetNext();
c626a8b7
VZ
512 }
513
717a57c2
VZ
514 // DoRemove() (unlike Remove) can only be called for existing item!
515 wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
c626a8b7 516
717a57c2
VZ
517#if wxUSE_ACCEL
518 // remove the corresponding accel from the accel table
519 int n = FindAccel(item->GetId());
520 if ( n != wxNOT_FOUND )
521 {
522 delete m_accels[n];
c626a8b7 523
b54e41c5 524 m_accels.RemoveAt(n);
c626a8b7 525 }
717a57c2
VZ
526 //else: this item doesn't have an accel, nothing to do
527#endif // wxUSE_ACCEL
528
529 // remove the item from the menu
530 if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
531 {
f6bcfd97 532 wxLogLastError(wxT("RemoveMenu"));
c626a8b7
VZ
533 }
534
4224f059 535 if ( IsAttached() && GetMenuBar()->IsAttached() )
717a57c2
VZ
536 {
537 // otherwise, the chane won't be visible
4224f059 538 GetMenuBar()->Refresh();
717a57c2 539 }
2bda0e17 540
717a57c2
VZ
541 // and from internal data structures
542 return wxMenuBase::DoRemove(item);
543}
d427503c 544
42e69d6b
VZ
545// ---------------------------------------------------------------------------
546// accelerator helpers
547// ---------------------------------------------------------------------------
548
717a57c2
VZ
549#if wxUSE_ACCEL
550
42e69d6b
VZ
551// create the wxAcceleratorEntries for our accels and put them into provided
552// array - return the number of accels we have
553size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const
554{
555 size_t count = GetAccelCount();
556 for ( size_t n = 0; n < count; n++ )
557 {
974e8d94 558 *accels++ = *m_accels[n];
42e69d6b
VZ
559 }
560
561 return count;
562}
563
d427503c
VZ
564#endif // wxUSE_ACCEL
565
c2dcfdef 566// ---------------------------------------------------------------------------
717a57c2 567// set wxMenu title
c2dcfdef
VZ
568// ---------------------------------------------------------------------------
569
2bda0e17
KB
570void wxMenu::SetTitle(const wxString& label)
571{
c626a8b7
VZ
572 bool hasNoTitle = m_title.IsEmpty();
573 m_title = label;
b8d3a4f1 574
c50f1fb9 575 HMENU hMenu = GetHmenu();
b8d3a4f1 576
c626a8b7 577 if ( hasNoTitle )
b8d3a4f1 578 {
c626a8b7
VZ
579 if ( !label.IsEmpty() )
580 {
717a57c2
VZ
581 if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
582 (unsigned)idMenuTitle, m_title) ||
583 !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
c626a8b7 584 {
f6bcfd97 585 wxLogLastError(wxT("InsertMenu"));
c626a8b7
VZ
586 }
587 }
b8d3a4f1
VZ
588 }
589 else
590 {
c626a8b7
VZ
591 if ( label.IsEmpty() )
592 {
593 // remove the title and the separator after it
594 if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
595 !RemoveMenu(hMenu, 0, MF_BYPOSITION) )
596 {
f6bcfd97 597 wxLogLastError(wxT("RemoveMenu"));
c626a8b7
VZ
598 }
599 }
600 else
601 {
602 // modify the title
4676948b
JS
603#ifdef __WXWINCE__
604 MENUITEMINFO info;
605 wxZeroMemory(info);
606 info.cbSize = sizeof(info);
607 info.fMask = MIIM_TYPE;
608 info.fType = MFT_STRING;
609 info.cch = m_title.Length();
610 info.dwTypeData = (LPTSTR) m_title.c_str();
611 if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
612 {
613 wxLogLastError(wxT("SetMenuItemInfo"));
614 }
615#else
c626a8b7 616 if ( !ModifyMenu(hMenu, 0u,
717a57c2
VZ
617 MF_BYPOSITION | MF_STRING,
618 (unsigned)idMenuTitle, m_title) )
c626a8b7 619 {
f6bcfd97 620 wxLogLastError(wxT("ModifyMenu"));
c626a8b7 621 }
4676948b 622#endif
c626a8b7 623 }
b8d3a4f1 624 }
b8d3a4f1 625
42e69d6b 626#ifdef __WIN32__
c626a8b7
VZ
627 // put the title string in bold face
628 if ( !m_title.IsEmpty() )
a3f4e9e8 629 {
0472ece7 630 SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle);
a3f4e9e8 631 }
717a57c2 632#endif // Win32
2bda0e17
KB
633}
634
c2dcfdef
VZ
635// ---------------------------------------------------------------------------
636// event processing
637// ---------------------------------------------------------------------------
2bda0e17 638
debe6624 639bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
2bda0e17 640{
a3f4e9e8
VZ
641 // ignore commands from the menu title
642
643 // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!!
644 if ( id != (WXWORD)idMenuTitle )
645 {
3ca6a5f0
BP
646 // VZ: previosuly, the command int was set to id too which was quite
647 // useless anyhow (as it could be retrieved using GetId()) and
648 // uncompatible with wxGTK, so now we use the command int instead
649 // to pass the checked status
4676948b
JS
650 UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND) ;
651 SendEvent(id, menuState & MF_CHECKED);
a3f4e9e8
VZ
652 }
653
654 return TRUE;
2bda0e17
KB
655}
656
c2dcfdef
VZ
657// ---------------------------------------------------------------------------
658// other
659// ---------------------------------------------------------------------------
2bda0e17 660
717a57c2
VZ
661wxWindow *wxMenu::GetWindow() const
662{
663 if ( m_invokingWindow != NULL )
664 return m_invokingWindow;
4224f059
DE
665 else if ( GetMenuBar() != NULL)
666 return GetMenuBar()->GetFrame();
717a57c2
VZ
667
668 return NULL;
c2dcfdef
VZ
669}
670
671// ---------------------------------------------------------------------------
2bda0e17 672// Menu Bar
c2dcfdef
VZ
673// ---------------------------------------------------------------------------
674
675void wxMenuBar::Init()
2bda0e17 676{
c626a8b7 677 m_eventHandler = this;
c626a8b7 678 m_hMenu = 0;
960b193e 679#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
39d2f9a7 680 m_toolBar = NULL;
a96b4743
JS
681#endif
682 // Not using a combined wxToolBar/wxMenuBar? then use
683 // a commandbar in WinCE .NET just to implement the
684 // menubar.
960b193e 685#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP))
a96b4743 686 m_commandBar = NULL;
39d2f9a7 687#endif
cba2db0c 688}
2bda0e17 689
c2dcfdef
VZ
690wxMenuBar::wxMenuBar()
691{
692 Init();
693}
694
cba2db0c
JS
695wxMenuBar::wxMenuBar( long WXUNUSED(style) )
696{
c2dcfdef 697 Init();
2bda0e17
KB
698}
699
c2dcfdef 700wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
2bda0e17 701{
c2dcfdef
VZ
702 Init();
703
a8cfd0cb 704 m_titles.Alloc(count);
c2dcfdef 705
a8cfd0cb
VZ
706 for ( int i = 0; i < count; i++ )
707 {
708 m_menus.Append(menus[i]);
709 m_titles.Add(titles[i]);
2bda0e17 710
a8cfd0cb
VZ
711 menus[i]->Attach(this);
712 }
2bda0e17
KB
713}
714
b8d3a4f1 715wxMenuBar::~wxMenuBar()
2bda0e17 716{
a96b4743 717 // In Windows CE (not .NET), the menubar is always associated
39d2f9a7 718 // with a toolbar, which destroys the menu implicitly.
960b193e 719#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
bf95a04f
JS
720 if (GetToolBar())
721 GetToolBar()->SetMenuBar(NULL);
722#else
7a0363dd
JS
723 // we should free Windows resources only if Windows doesn't do it for us
724 // which happens if we're attached to a frame
725 if (m_hMenu && !IsAttached())
726 {
960b193e 727#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP))
a96b4743
JS
728 ::DestroyWindow((HWND) m_commandBar);
729 m_commandBar = (WXHWND) NULL;
730#else
7a0363dd 731 ::DestroyMenu((HMENU)m_hMenu);
a96b4743 732#endif
7a0363dd
JS
733 m_hMenu = (WXHMENU)NULL;
734 }
39d2f9a7 735#endif
c2dcfdef 736}
2bda0e17 737
c2dcfdef
VZ
738// ---------------------------------------------------------------------------
739// wxMenuBar helpers
740// ---------------------------------------------------------------------------
741
742void wxMenuBar::Refresh()
743{
065de612 744 wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
c2dcfdef 745
960b193e 746#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
39d2f9a7
JS
747 if (GetToolBar())
748 {
749 CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0);
750 }
960b193e 751#elif defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP))
a96b4743
JS
752 if (m_commandBar)
753 DrawMenuBar((HWND) m_commandBar);
39d2f9a7 754#else
1e6feb95 755 DrawMenuBar(GetHwndOf(GetFrame()));
39d2f9a7 756#endif
c2dcfdef
VZ
757}
758
759WXHMENU wxMenuBar::Create()
760{
beb471b5
JS
761 // Note: this totally doesn't work on Smartphone,
762 // since you have to use resources.
763 // We'll have to find another way to add a menu
764 // by changing/adding menu items to an existing menu.
960b193e 765#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
39d2f9a7
JS
766 if ( m_hMenu != 0 )
767 return m_hMenu;
768
769 if (!GetToolBar())
770 return 0;
771
772 HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
773 HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0);
774 if (hMenu)
775 {
776 TBBUTTON tbButton;
777 memset(&tbButton, 0, sizeof(TBBUTTON));
778 tbButton.iBitmap = I_IMAGENONE;
779 tbButton.fsState = TBSTATE_ENABLED;
780 tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
781
782 size_t i;
783 for (i = 0; i < GetMenuCount(); i++)
784 {
785 HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu() ;
786 tbButton.dwData = (DWORD)hPopupMenu;
787 wxString label = wxStripMenuCodes(GetLabelTop(i));
788 tbButton.iString = (int) label.c_str();
beb471b5
JS
789
790 int position = i;
39d2f9a7
JS
791
792 tbButton.idCommand = NewControlId();
beb471b5 793 if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton))
39d2f9a7
JS
794 {
795 wxLogLastError(wxT("TB_INSERTBUTTON"));
796 }
797 }
798 }
799 m_hMenu = (WXHMENU) hMenu;
800 return m_hMenu;
801#else
3ca6a5f0 802 if ( m_hMenu != 0 )
717a57c2 803 return m_hMenu;
1cf27c63 804
c2dcfdef 805 m_hMenu = (WXHMENU)::CreateMenu();
2bda0e17 806
c2dcfdef 807 if ( !m_hMenu )
c626a8b7 808 {
f6bcfd97 809 wxLogLastError(wxT("CreateMenu"));
c626a8b7 810 }
c2dcfdef 811 else
c626a8b7 812 {
222ed1d6
MB
813 size_t count = GetMenuCount(), i;
814 wxMenuList::iterator it;
815 for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
c2dcfdef
VZ
816 {
817 if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
222ed1d6 818 (UINT)(*it)->GetHMenu(),
c2dcfdef
VZ
819 m_titles[i]) )
820 {
f6bcfd97 821 wxLogLastError(wxT("AppendMenu"));
c2dcfdef
VZ
822 }
823 }
c626a8b7 824 }
c626a8b7 825
c2dcfdef 826 return m_hMenu;
39d2f9a7 827#endif
2bda0e17
KB
828}
829
b2c5f143
DE
830int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
831{
832 wxASSERT(menu);
833 wxASSERT(menu->GetHMenu());
834 wxASSERT(m_hMenu);
8cc4850c
JS
835
836#if defined(__WXWINCE__)
837 int totalMSWItems = GetMenuCount();
838#else
b2c5f143 839 int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu);
8cc4850c
JS
840#endif
841
b2c5f143
DE
842 int i; // For old C++ compatibility
843 for(i=wxpos; i<totalMSWItems; i++)
844 {
845 if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
846 return i;
847 }
848 for(i=0; i<wxpos; i++)
849 {
850 if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
851 return i;
852 }
853 wxFAIL;
854 return -1;
855}
856
c2dcfdef 857// ---------------------------------------------------------------------------
3dfac970 858// wxMenuBar functions to work with the top level submenus
c2dcfdef
VZ
859// ---------------------------------------------------------------------------
860
3dfac970
VZ
861// NB: we don't support owner drawn top level items for now, if we do these
862// functions would have to be changed to use wxMenuItem as well
2bda0e17 863
a8cfd0cb 864void wxMenuBar::EnableTop(size_t pos, bool enable)
2bda0e17 865{
717a57c2 866 wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
b2c5f143 867 wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
717a57c2
VZ
868
869 int flag = enable ? MF_ENABLED : MF_GRAYED;
2bda0e17 870
b2c5f143 871 EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag);
adc6fb16
VZ
872
873 Refresh();
2bda0e17
KB
874}
875
a8cfd0cb 876void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
2bda0e17 877{
717a57c2
VZ
878 wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
879
880 m_titles[pos] = label;
881
882 if ( !IsAttached() )
883 {
884 return;
885 }
886 //else: have to modify the existing menu
887
b2c5f143
DE
888 int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
889
8cd85069 890 UINT id;
b2c5f143 891 UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
c2dcfdef 892 if ( flagsOld == 0xFFFFFFFF )
c626a8b7 893 {
223d09f6 894 wxLogLastError(wxT("GetMenuState"));
c2dcfdef
VZ
895
896 return;
897 }
898
899 if ( flagsOld & MF_POPUP )
900 {
901 // HIBYTE contains the number of items in the submenu in this case
ad9bb75f 902 flagsOld &= 0xff;
b2c5f143 903 id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos);
c626a8b7
VZ
904 }
905 else
8cd85069
VZ
906 {
907 id = pos;
908 }
909
4676948b
JS
910#ifdef __WXWINCE__
911 MENUITEMINFO info;
912 wxZeroMemory(info);
913 info.cbSize = sizeof(info);
914 info.fMask = MIIM_TYPE;
915 info.fType = MFT_STRING;
916 info.cch = label.Length();
917 info.dwTypeData = (LPTSTR) label.c_str();
918 if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, & info) )
919 {
920 wxLogLastError(wxT("SetMenuItemInfo"));
921 }
922
923#else
b2c5f143 924 if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
4676948b 925 id, label) == (int)0xFFFFFFFF )
c2dcfdef 926 {
f6bcfd97 927 wxLogLastError(wxT("ModifyMenu"));
c2dcfdef 928 }
4676948b 929#endif
717a57c2
VZ
930
931 Refresh();
2bda0e17
KB
932}
933
a8cfd0cb 934wxString wxMenuBar::GetLabelTop(size_t pos) const
2bda0e17 935{
717a57c2
VZ
936 wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
937 wxT("invalid menu index in wxMenuBar::GetLabelTop") );
8cd85069 938
4a1c207c 939 return wxMenuItem::GetLabelFromText(m_titles[pos]);
2bda0e17
KB
940}
941
ad9bb75f
VZ
942// ---------------------------------------------------------------------------
943// wxMenuBar construction
944// ---------------------------------------------------------------------------
945
a8cfd0cb 946wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
1cf27c63 947{
ad9bb75f
VZ
948 wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
949 if ( !menuOld )
f7f50f49
VZ
950 return NULL;
951
ad9bb75f 952 m_titles[pos] = title;
a8cfd0cb 953
ad9bb75f 954 if ( IsAttached() )
a8cfd0cb 955 {
b2c5f143
DE
956 int mswpos = MSWPositionForWxMenu(menuOld,pos);
957
ad9bb75f 958 // can't use ModifyMenu() because it deletes the submenu it replaces
b2c5f143 959 if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) )
a8cfd0cb 960 {
f6bcfd97 961 wxLogLastError(wxT("RemoveMenu"));
a8cfd0cb 962 }
1cf27c63 963
b2c5f143 964 if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
ad9bb75f
VZ
965 MF_BYPOSITION | MF_POPUP | MF_STRING,
966 (UINT)GetHmenuOf(menu), title) )
967 {
f6bcfd97 968 wxLogLastError(wxT("InsertMenu"));
ad9bb75f
VZ
969 }
970
717a57c2
VZ
971#if wxUSE_ACCEL
972 if ( menuOld->HasAccels() || menu->HasAccels() )
973 {
974 // need to rebuild accell table
975 RebuildAccelTable();
976 }
977#endif // wxUSE_ACCEL
978
ad9bb75f 979 Refresh();
a8cfd0cb 980 }
ad9bb75f
VZ
981
982 return menuOld;
1cf27c63
UM
983}
984
a8cfd0cb 985bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
1cf27c63 986{
b2c5f143
DE
987 // Find out which MSW item before which we'll be inserting before
988 // wxMenuBarBase::Insert is called and GetMenu(pos) is the new menu.
3d27b574
DE
989 // If IsAttached() is false this won't be used anyway
990 int mswpos = (!IsAttached() || (pos == m_menus.GetCount()))
b2c5f143
DE
991 ? -1 // append the menu
992 : MSWPositionForWxMenu(GetMenu(pos),pos);
993
ad9bb75f 994 if ( !wxMenuBarBase::Insert(pos, menu, title) )
a8cfd0cb 995 return FALSE;
1cf27c63 996
ad9bb75f
VZ
997 m_titles.Insert(title, pos);
998
ad9bb75f
VZ
999 if ( IsAttached() )
1000 {
960b193e 1001#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
39d2f9a7
JS
1002 if (!GetToolBar())
1003 return FALSE;
1004 TBBUTTON tbButton;
1005 memset(&tbButton, 0, sizeof(TBBUTTON));
1006 tbButton.iBitmap = I_IMAGENONE;
1007 tbButton.fsState = TBSTATE_ENABLED;
1008 tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
1009
1010 HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
1011 tbButton.dwData = (DWORD)hPopupMenu;
1012 wxString label = wxStripMenuCodes(title);
1013 tbButton.iString = (int) label.c_str();
1014
1015 tbButton.idCommand = NewControlId();
1016 if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
1017 {
1018 wxLogLastError(wxT("TB_INSERTBUTTON"));
1019 return FALSE;
1020 }
1021#else
b2c5f143 1022 if ( !::InsertMenu(GetHmenu(), mswpos,
ad9bb75f
VZ
1023 MF_BYPOSITION | MF_POPUP | MF_STRING,
1024 (UINT)GetHmenuOf(menu), title) )
1025 {
f6bcfd97 1026 wxLogLastError(wxT("InsertMenu"));
ad9bb75f 1027 }
39d2f9a7 1028#endif
717a57c2
VZ
1029#if wxUSE_ACCEL
1030 if ( menu->HasAccels() )
1031 {
1032 // need to rebuild accell table
1033 RebuildAccelTable();
1034 }
1035#endif // wxUSE_ACCEL
1036
ad9bb75f 1037 Refresh();
a8cfd0cb 1038 }
ad9bb75f
VZ
1039
1040 return TRUE;
1cf27c63
UM
1041}
1042
ad9bb75f 1043bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
2bda0e17 1044{
ad9bb75f
VZ
1045 WXHMENU submenu = menu ? menu->GetHMenu() : 0;
1046 wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") );
2bda0e17 1047
717a57c2
VZ
1048 if ( !wxMenuBarBase::Append(menu, title) )
1049 return FALSE;
1050
717a57c2
VZ
1051 m_titles.Add(title);
1052
ad9bb75f
VZ
1053 if ( IsAttached() )
1054 {
960b193e 1055#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
39d2f9a7
JS
1056 if (!GetToolBar())
1057 return FALSE;
1058 TBBUTTON tbButton;
1059 memset(&tbButton, 0, sizeof(TBBUTTON));
1060 tbButton.iBitmap = I_IMAGENONE;
1061 tbButton.fsState = TBSTATE_ENABLED;
1062 tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
1063
1064 size_t pos = GetMenuCount();
1065 HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
1066 tbButton.dwData = (DWORD)hPopupMenu;
1067 wxString label = wxStripMenuCodes(title);
1068 tbButton.iString = (int) label.c_str();
1069
1070 tbButton.idCommand = NewControlId();
1071 if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
1072 {
1073 wxLogLastError(wxT("TB_INSERTBUTTON"));
1074 return FALSE;
1075 }
1076#else
ad9bb75f
VZ
1077 if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
1078 (UINT)submenu, title) )
1079 {
1080 wxLogLastError(wxT("AppendMenu"));
1081 }
39d2f9a7 1082#endif
ad9bb75f 1083
717a57c2
VZ
1084#if wxUSE_ACCEL
1085 if ( menu->HasAccels() )
1086 {
39d2f9a7 1087 // need to rebuild accelerator table
717a57c2
VZ
1088 RebuildAccelTable();
1089 }
1090#endif // wxUSE_ACCEL
1091
ad9bb75f
VZ
1092 Refresh();
1093 }
2bda0e17 1094
a8cfd0cb 1095 return TRUE;
2bda0e17
KB
1096}
1097
a8cfd0cb 1098wxMenu *wxMenuBar::Remove(size_t pos)
2bda0e17 1099{
a8cfd0cb
VZ
1100 wxMenu *menu = wxMenuBarBase::Remove(pos);
1101 if ( !menu )
1102 return NULL;
c626a8b7 1103
ad9bb75f
VZ
1104 if ( IsAttached() )
1105 {
960b193e 1106#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
39d2f9a7
JS
1107 if (GetToolBar())
1108 {
1109 if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0))
1110 {
1111 wxLogLastError(wxT("TB_DELETEBUTTON"));
1112 }
1113 }
1114#else
b2c5f143 1115 if ( !::RemoveMenu(GetHmenu(), (UINT)MSWPositionForWxMenu(menu,pos), MF_BYPOSITION) )
ad9bb75f 1116 {
f6bcfd97 1117 wxLogLastError(wxT("RemoveMenu"));
ad9bb75f 1118 }
39d2f9a7 1119#endif
c4053ed3 1120
717a57c2
VZ
1121#if wxUSE_ACCEL
1122 if ( menu->HasAccels() )
1123 {
1124 // need to rebuild accell table
1125 RebuildAccelTable();
1126 }
1127#endif // wxUSE_ACCEL
1128
ad9bb75f
VZ
1129 Refresh();
1130 }
2bda0e17 1131
c4053ed3
RN
1132
1133 m_titles.RemoveAt(pos);
2bda0e17 1134
a8cfd0cb 1135 return menu;
2bda0e17
KB
1136}
1137
d427503c 1138#if wxUSE_ACCEL
717a57c2
VZ
1139
1140void wxMenuBar::RebuildAccelTable()
1141{
1142 // merge the accelerators of all menus into one accel table
42e69d6b 1143 size_t nAccelCount = 0;
a8cfd0cb 1144 size_t i, count = GetMenuCount();
222ed1d6
MB
1145 wxMenuList::iterator it;
1146 for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
42e69d6b 1147 {
222ed1d6 1148 nAccelCount += (*it)->GetAccelCount();
42e69d6b
VZ
1149 }
1150
5df1250b 1151 if ( nAccelCount )
42e69d6b 1152 {
5df1250b 1153 wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
42e69d6b 1154
5df1250b 1155 nAccelCount = 0;
222ed1d6 1156 for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
5df1250b 1157 {
222ed1d6 1158 nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
5df1250b
VZ
1159 }
1160
1161 m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
42e69d6b 1162
5df1250b
VZ
1163 delete [] accelEntries;
1164 }
717a57c2
VZ
1165}
1166
1167#endif // wxUSE_ACCEL
1168
1169void wxMenuBar::Attach(wxFrame *frame)
1170{
1e6feb95 1171 wxMenuBarBase::Attach(frame);
717a57c2 1172
960b193e 1173#if defined(__WXWINCE__)
a96b4743
JS
1174 if (!m_hMenu)
1175 this->Create();
960b193e
JS
1176#if _WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)
1177
1178 // No idea why this was here, but it seems to be obsolete.
1179 // Remove after testing with other WinCE combinations - April 2004
1180#if 0
a96b4743
JS
1181 if (GetToolBar())
1182 {
1183 HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
1184 if (!CommandBar_InsertMenubarEx(hCommandBar, NULL, (LPTSTR) m_hMenu, 0))
1185 {
1186 wxLogLastError(wxT("CommandBar_InsertMenubarEx"));
1187 }
1188 }
960b193e 1189#endif
a96b4743
JS
1190#else
1191 if (!m_commandBar)
1192 m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId());
1193 if (m_commandBar)
1194 {
1195 if (m_hMenu)
1196 {
1197 if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, (LPTSTR) m_hMenu, 0))
1198 {
1199 wxLogLastError(wxT("CommandBar_InsertMenubarEx"));
1200 }
1201 }
1202 }
1203#endif
960b193e 1204 // PSPC/WFSP
a96b4743
JS
1205#endif
1206 // __WXWINCE__ && _WIN32_WCE >= 400
1207
717a57c2
VZ
1208#if wxUSE_ACCEL
1209 RebuildAccelTable();
d427503c 1210#endif // wxUSE_ACCEL
42e69d6b
VZ
1211}
1212
1cf27c63
UM
1213void wxMenuBar::Detach()
1214{
1e6feb95 1215 wxMenuBarBase::Detach();
2bda0e17
KB
1216}
1217
1e6feb95 1218#endif // wxUSE_MENUS