src/msw/menu.cpp

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