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 // Copyright:   (c) Julian Smart
   8 // Licence:     wxWindows licence
   9 /////////////////////////////////////////////////////////////////////////////
  10
  11 // ===========================================================================
  12 // declarations
  13 // ===========================================================================
  14
  15 // ---------------------------------------------------------------------------
  16 // headers
  17 // ---------------------------------------------------------------------------
  18
  19 // For compilers that support precompilation, includes "wx.h".
  20 #include "wx/wxprec.h"
  21
  22 #ifdef __BORLANDC__
  23     #pragma hdrstop
  24 #endif
  25
  26 #if wxUSE_MENUS
  27
  28 #include "wx/menu.h"
  29
  30 #ifndef WX_PRECOMP
  31     #include "wx/frame.h"
  32     #include "wx/utils.h"
  33     #include "wx/intl.h"
  34     #include "wx/log.h"
  35     #include "wx/image.h"
  36 #endif
  37
  38 #if wxUSE_OWNER_DRAWN
  39     #include "wx/ownerdrw.h"
  40 #endif
  41
  42 #include "wx/scopedarray.h"
  43 #include "wx/vector.h"
  44
  45 #include "wx/msw/private.h"
  46 #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
  47
  48 #ifdef __WXWINCE__
  49 #include <windows.h>
  50 #include <windowsx.h>
  51 #include <tchar.h>
  52 #include <ole2.h>
  53 #include <shellapi.h>
  54 #if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__)
  55 #include <aygshell.h>
  56 #endif
  57
  58 #include "wx/msw/wince/missing.h"
  59
  60 #endif
  61
  62 // other standard headers
  63 #include <string.h>
  64
  65 #if wxUSE_OWNER_DRAWN
  66     #include "wx/dynlib.h"
  67 #endif
  68
  69 #ifndef MNS_CHECKORBMP
  70     #define MNS_CHECKORBMP 0x04000000
  71 #endif
  72 #ifndef MIM_STYLE
  73     #define MIM_STYLE 0x00000010
  74 #endif
  75
  76 // ----------------------------------------------------------------------------
  77 // global variables
  78 // ----------------------------------------------------------------------------
  79
  80 // ----------------------------------------------------------------------------
  81 // constants
  82 // ----------------------------------------------------------------------------
  83
  84 // the (popup) menu title has this special id
  85 static const int idMenuTitle = wxID_NONE;
  86
  87 // ----------------------------------------------------------------------------
  88 // private helper classes and functions
  89 // ----------------------------------------------------------------------------
  90
  91 // Contains the data about the radio items groups in the given menu.
  92 class wxMenuRadioItemsData
  93 {
  94 public:
  95     wxMenuRadioItemsData() { }
  96
  97     // Default copy ctor, assignment operator and dtor are all ok.
  98
  99     // Find the start and end of the group containing the given position or
 100     // return false if it's not inside any range.
 101     bool GetGroupRange(int pos, int *start, int *end) const
 102     {
 103         // We use a simple linear search here because there are not that many
 104         // items in a menu and hence even fewer radio items ranges anyhow, so
 105         // normally there is no need to do anything fancy (like keeping the
 106         // array sorted and using binary search).
 107         for ( Ranges::const_iterator it = m_ranges.begin();
 108               it != m_ranges.end();
 109               ++it )
 110         {
 111             const Range& r = *it;
 112
 113             if ( r.start <= pos && pos <= r.end )
 114             {
 115                 if ( start )
 116                     *start = r.start;
 117                 if ( end )
 118                     *end = r.end;
 119
 120                 return true;
 121             }
 122         }
 123
 124         return false;
 125     }
 126
 127     // Take into account the new radio item about to be added at the given
 128     // position.
 129     //
 130     // Returns true if this item starts a new radio group, false if it extends
 131     // an existing one.
 132     bool UpdateOnInsert(int pos)
 133     {
 134         bool inExistingGroup = false;
 135
 136         for ( Ranges::iterator it = m_ranges.begin();
 137               it != m_ranges.end();
 138               ++it )
 139         {
 140             Range& r = *it;
 141
 142             if ( pos < r.start )
 143             {
 144                 // Item is inserted before this range, update its indices.
 145                 r.start++;
 146                 r.end++;
 147             }
 148             else if ( pos <= r.end + 1 )
 149             {
 150                 // Item is inserted in the middle of this range or immediately
 151                 // after it in which case it extends this range so make it span
 152                 // one more item in any case.
 153                 r.end++;
 154
 155                 inExistingGroup = true;
 156             }
 157             //else: Item is inserted after this range, nothing to do for it.
 158         }
 159
 160         if ( inExistingGroup )
 161             return false;
 162
 163         // Make a new range for the group this item will belong to.
 164         Range r;
 165         r.start = pos;
 166         r.end = pos;
 167         m_ranges.push_back(r);
 168
 169         return true;
 170     }
 171
 172 private:
 173     // Contains the inclusive positions of the range start and end.
 174     struct Range
 175     {
 176         int start;
 177         int end;
 178     };
 179
 180     typedef wxVector<Range> Ranges;
 181     Ranges m_ranges;
 182 };
 183
 184 namespace
 185 {
 186
 187 // make the given menu item default
 188 void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
 189                         UINT WXUNUSED_IN_WINCE(id))
 190 {
 191 #ifndef __WXWINCE__
 192     WinStruct<MENUITEMINFO> mii;
 193     mii.fMask = MIIM_STATE;
 194     mii.fState = MFS_DEFAULT;
 195
 196     if ( !::SetMenuItemInfo(hmenu, id, FALSE, &mii) )
 197     {
 198         wxLogLastError(wxT("SetMenuItemInfo"));
 199     }
 200 #endif // !__WXWINCE__
 201 }
 202
 203 // make the given menu item owner-drawn
 204 void SetOwnerDrawnMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
 205                            UINT WXUNUSED_IN_WINCE(id),
 206                            ULONG_PTR WXUNUSED_IN_WINCE(data),
 207                            BOOL WXUNUSED_IN_WINCE(byPositon = FALSE))
 208 {
 209 #ifndef __WXWINCE__
 210     WinStruct<MENUITEMINFO> mii;
 211     mii.fMask = MIIM_FTYPE | MIIM_DATA;
 212     mii.fType = MFT_OWNERDRAW;
 213     mii.dwItemData = data;
 214
 215     if ( reinterpret_cast<wxMenuItem*>(data)->IsSeparator() )
 216         mii.fType |= MFT_SEPARATOR;
 217
 218     if ( !::SetMenuItemInfo(hmenu, id, byPositon, &mii) )
 219     {
 220         wxLogLastError(wxT("SetMenuItemInfo"));
 221     }
 222 #endif // !__WXWINCE__
 223 }
 224
 225 #ifdef __WXWINCE__
 226 UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
 227 {
 228     WinStruct<MENUITEMINFO> info;
 229     info.fMask = MIIM_STATE;
 230     // MF_BYCOMMAND is zero so test MF_BYPOSITION
 231     if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) )
 232     {
 233         wxLogLastError(wxT("GetMenuItemInfo"));
 234     }
 235     return info.fState;
 236 }
 237 #endif // __WXWINCE__
 238
 239 inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
 240 {
 241     return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
 242             bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);
 243 }
 244
 245 } // anonymous namespace
 246
 247 // ============================================================================
 248 // implementation
 249 // ============================================================================
 250
 251 // ---------------------------------------------------------------------------
 252 // wxMenu construction, adding and removing menu items
 253 // ---------------------------------------------------------------------------
 254
 255 // Construct a menu with optional title (then use append)
 256 void wxMenu::InitNoCreate()
 257 {
 258     m_radioData = NULL;
 259     m_doBreak = false;
 260
 261 #if wxUSE_OWNER_DRAWN
 262     m_ownerDrawn = false;
 263     m_maxBitmapWidth = 0;
 264     m_maxAccelWidth = -1;
 265 #endif // wxUSE_OWNER_DRAWN
 266 }
 267
 268 void wxMenu::Init()
 269 {
 270     InitNoCreate();
 271
 272     // create the menu
 273     m_hMenu = (WXHMENU)CreatePopupMenu();
 274     if ( !m_hMenu )
 275     {
 276         wxLogLastError(wxT("CreatePopupMenu"));
 277     }
 278
 279     // if we have a title, insert it in the beginning of the menu
 280     if ( !m_title.empty() )
 281     {
 282         const wxString title = m_title;
 283         m_title.clear(); // so that SetTitle() knows there was no title before
 284         SetTitle(title);
 285     }
 286 }
 287
 288 wxMenu::wxMenu(WXHMENU hMenu)
 289 {
 290     InitNoCreate();
 291
 292     m_hMenu = hMenu;
 293
 294     // Ensure that our internal idea of how many items we have corresponds to
 295     // the real number of items in the menu.
 296     //
 297     // We could also retrieve the real labels of the items here but it doesn't
 298     // seem to be worth the trouble.
 299     const int numExistingItems = ::GetMenuItemCount(m_hMenu);
 300     for ( int n = 0; n < numExistingItems; n++ )
 301     {
 302         wxMenuBase::DoAppend(wxMenuItem::New(this, wxID_SEPARATOR));
 303     }
 304 }
 305
 306 // The wxWindow destructor will take care of deleting the submenus.
 307 wxMenu::~wxMenu()
 308 {
 309     // we should free Windows resources only if Windows doesn't do it for us
 310     // which happens if we're attached to a menubar or a submenu of another
 311     // menu
 312     if ( !IsAttached() && !GetParent() )
 313     {
 314         if ( !::DestroyMenu(GetHmenu()) )
 315         {
 316             wxLogLastError(wxT("DestroyMenu"));
 317         }
 318     }
 319
 320 #if wxUSE_ACCEL
 321     // delete accels
 322     WX_CLEAR_ARRAY(m_accels);
 323 #endif // wxUSE_ACCEL
 324
 325     delete m_radioData;
 326 }
 327
 328 void wxMenu::Break()
 329 {
 330     // this will take effect during the next call to Append()
 331     m_doBreak = true;
 332 }
 333
 334 #if wxUSE_ACCEL
 335
 336 int wxMenu::FindAccel(int id) const
 337 {
 338     size_t n, count = m_accels.GetCount();
 339     for ( n = 0; n < count; n++ )
 340     {
 341         if ( m_accels[n]->m_command == id )
 342             return n;
 343     }
 344
 345     return wxNOT_FOUND;
 346 }
 347
 348 void wxMenu::UpdateAccel(wxMenuItem *item)
 349 {
 350     if ( item->IsSubMenu() )
 351     {
 352         wxMenu *submenu = item->GetSubMenu();
 353         wxMenuItemList::compatibility_iterator node = submenu->GetMenuItems().GetFirst();
 354         while ( node )
 355         {
 356             UpdateAccel(node->GetData());
 357
 358             node = node->GetNext();
 359         }
 360     }
 361     else if ( !item->IsSeparator() )
 362     {
 363         // recurse upwards: we should only modify m_accels of the top level
 364         // menus, not of the submenus as wxMenuBar doesn't look at them
 365         // (alternative and arguable cleaner solution would be to recurse
 366         // downwards in GetAccelCount() and CopyAccels())
 367         if ( GetParent() )
 368         {
 369             GetParent()->UpdateAccel(item);
 370             return;
 371         }
 372
 373         // find the (new) accel for this item
 374         wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetItemLabel());
 375         if ( accel )
 376             accel->m_command = item->GetId();
 377
 378         // find the old one
 379         int n = FindAccel(item->GetId());
 380         if ( n == wxNOT_FOUND )
 381         {
 382             // no old, add new if any
 383             if ( accel )
 384                 m_accels.Add(accel);
 385             else
 386                 return;     // skipping RebuildAccelTable() below
 387         }
 388         else
 389         {
 390             // replace old with new or just remove the old one if no new
 391             delete m_accels[n];
 392             if ( accel )
 393                 m_accels[n] = accel;
 394             else
 395                 m_accels.RemoveAt(n);
 396         }
 397
 398         if ( IsAttached() )
 399         {
 400             GetMenuBar()->RebuildAccelTable();
 401         }
 402
 403 #if wxUSE_OWNER_DRAWN
 404         ResetMaxAccelWidth();
 405 #endif
 406     }
 407     //else: it is a separator, they can't have accels, nothing to do
 408 }
 409
 410 #endif // wxUSE_ACCEL
 411
 412 namespace
 413 {
 414
 415 // helper of DoInsertOrAppend(): returns the HBITMAP to use in MENUITEMINFO
 416 HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true)
 417 {
 418     // Under versions of Windows older than Vista we can't pass HBITMAP
 419     // directly as hbmpItem for 2 reasons:
 420     //  1. We can't draw it with transparency then (this is not
 421     //     very important now but would be with themed menu bg)
 422     //  2. Worse, Windows inverts the bitmap for the selected
 423     //     item and this looks downright ugly
 424     //
 425     // So we prefer to instead draw it ourselves in MSWOnDrawItem().by using
 426     // HBMMENU_CALLBACK when inserting it
 427     //
 428     // However under Vista using HBMMENU_CALLBACK causes the entire menu to be
 429     // drawn using the classic theme instead of the current one and it does
 430     // handle transparency just fine so do use the real bitmap there
 431 #if wxUSE_IMAGE
 432     if ( wxGetWinVersion() >= wxWinVersion_Vista )
 433     {
 434 #if wxUSE_OWNER_DRAWN
 435         wxBitmap bmp = pItem->GetBitmap(checked);
 436         if ( bmp.IsOk() )
 437         {
 438             // we must use PARGB DIB for the menu bitmaps so ensure that we do
 439             wxImage img(bmp.ConvertToImage());
 440             if ( !img.HasAlpha() )
 441             {
 442                 img.InitAlpha();
 443                 pItem->SetBitmap(img, checked);
 444             }
 445
 446             return GetHbitmapOf(pItem->GetBitmap(checked));
 447         }
 448 #endif // wxUSE_OWNER_DRAWN
 449         //else: bitmap is not set
 450
 451         return NULL;
 452     }
 453 #endif // wxUSE_IMAGE
 454
 455     return HBMMENU_CALLBACK;
 456 }
 457
 458 } // anonymous namespace
 459
 460 bool wxMenu::MSWGetRadioGroupRange(int pos, int *start, int *end) const
 461 {
 462     return m_radioData && m_radioData->GetGroupRange(pos, start, end);
 463 }
 464
 465 // append a new item or submenu to the menu
 466 bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 467 {
 468 #if wxUSE_ACCEL
 469     UpdateAccel(pItem);
 470 #endif // wxUSE_ACCEL
 471
 472     // we should support disabling the item even prior to adding it to the menu
 473     UINT flags = pItem->IsEnabled() ? MF_ENABLED : MF_GRAYED;
 474
 475     // if "Break" has just been called, insert a menu break before this item
 476     // (and don't forget to reset the flag)
 477     if ( m_doBreak ) {
 478         flags |= MF_MENUBREAK;
 479         m_doBreak = false;
 480     }
 481
 482     if ( pItem->IsSeparator() ) {
 483         flags |= MF_SEPARATOR;
 484     }
 485
 486     // id is the numeric id for normal menu items and HMENU for submenus as
 487     // required by ::AppendMenu() API
 488     UINT_PTR id;
 489     wxMenu *submenu = pItem->GetSubMenu();
 490     if ( submenu != NULL ) {
 491         wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") );
 492
 493         submenu->SetParent(this);
 494
 495         id = (UINT_PTR)submenu->GetHMenu();
 496
 497         flags |= MF_POPUP;
 498     }
 499     else {
 500         id = pItem->GetMSWId();
 501     }
 502
 503
 504     // prepare to insert the item in the menu
 505     wxString itemText = pItem->GetItemLabel();
 506     LPCTSTR pData = NULL;
 507     if ( pos == (size_t)-1 )
 508     {
 509         // append at the end (note that the item is already appended to
 510         // internal data structures)
 511         pos = GetMenuItemCount() - 1;
 512     }
 513
 514     // Update radio groups data if we're inserting a new radio item.
 515     //
 516     // NB: If we supported inserting non-radio items in the middle of existing
 517     //     radio groups to break them into two subgroups, we'd need to update
 518     //     m_radioData in this case too but currently this is not supported.
 519     bool checkInitially = false;
 520     if ( pItem->GetKind() == wxITEM_RADIO )
 521     {
 522         if ( !m_radioData )
 523             m_radioData = new wxMenuRadioItemsData;
 524
 525         if ( m_radioData->UpdateOnInsert(pos) )
 526             checkInitially = true;
 527     }
 528
 529     // adjust position to account for the title of a popup menu, if any
 530     if ( !GetMenuBar() && !m_title.empty() )
 531         pos += 2; // for the title itself and its separator
 532
 533     BOOL ok = false;
 534
 535 #if wxUSE_OWNER_DRAWN
 536     // Under older systems mixing owner-drawn and non-owner-drawn items results
 537     // in inconsistent margins, so we force this one to be owner-drawn if any
 538     // other items already are.
 539     if ( m_ownerDrawn )
 540         pItem->SetOwnerDrawn(true);
 541 #endif // wxUSE_OWNER_DRAWN
 542
 543     // check if we have something more than a simple text item
 544 #if wxUSE_OWNER_DRAWN
 545     bool makeItemOwnerDrawn = false;
 546     if ( pItem->IsOwnerDrawn() )
 547     {
 548 #ifndef __DMC__
 549
 550         if ( !m_ownerDrawn && !pItem->IsSeparator() )
 551         {
 552             // MIIM_BITMAP only works under WinME/2000+ so we always use owner
 553             // drawn item under the previous versions and we also have to use
 554             // them in any case if the item has custom colours or font
 555             static const wxWinVersion winver = wxGetWinVersion();
 556             bool mustUseOwnerDrawn = winver < wxWinVersion_98 ||
 557                                      pItem->GetTextColour().IsOk() ||
 558                                      pItem->GetBackgroundColour().IsOk() ||
 559                                      pItem->GetFont().IsOk();
 560
 561             if ( !mustUseOwnerDrawn )
 562             {
 563                 const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
 564                                 bmpChecked   = pItem->GetBitmap(true);
 565
 566                 if ( (bmpUnchecked.IsOk() && IsGreaterThanStdSize(bmpUnchecked)) ||
 567                      (bmpChecked.IsOk()   && IsGreaterThanStdSize(bmpChecked)) )
 568                 {
 569                     mustUseOwnerDrawn = true;
 570                 }
 571             }
 572
 573             // use InsertMenuItem() if possible as it's guaranteed to look
 574             // correct while our owner-drawn code is not
 575             if ( !mustUseOwnerDrawn )
 576             {
 577                 WinStruct<MENUITEMINFO> mii;
 578                 mii.fMask = MIIM_STRING | MIIM_DATA;
 579
 580                 // don't set hbmpItem for the checkable items as it would
 581                 // be used for both checked and unchecked state
 582                 if ( pItem->IsCheckable() )
 583                 {
 584                     mii.fMask |= MIIM_CHECKMARKS;
 585                     mii.hbmpChecked = GetHBitmapForMenu(pItem, true);
 586                     mii.hbmpUnchecked = GetHBitmapForMenu(pItem, false);
 587                 }
 588                 else if ( pItem->GetBitmap().IsOk() )
 589                 {
 590                     mii.fMask |= MIIM_BITMAP;
 591                     mii.hbmpItem = GetHBitmapForMenu(pItem);
 592                 }
 593
 594                 mii.cch = itemText.length();
 595                 mii.dwTypeData = wxMSW_CONV_LPTSTR(itemText);
 596
 597                 if ( flags & MF_POPUP )
 598                 {
 599                     mii.fMask |= MIIM_SUBMENU;
 600                     mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu());
 601                 }
 602                 else
 603                 {
 604                     mii.fMask |= MIIM_ID;
 605                     mii.wID = id;
 606                 }
 607
 608                 mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
 609
 610                 ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
 611                 if ( !ok )
 612                 {
 613                     wxLogLastError(wxT("InsertMenuItem()"));
 614                 }
 615                 else // InsertMenuItem() ok
 616                 {
 617                     // we need to remove the extra indent which is reserved for
 618                     // the checkboxes by default as it looks ugly unless check
 619                     // boxes are used together with bitmaps and this is not the
 620                     // case in wx API
 621                     WinStruct<MENUINFO> mi;
 622
 623                     // don't call SetMenuInfo() directly, this would prevent
 624                     // the app from starting up under Windows 95/NT 4
 625                     typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *);
 626
 627                     wxDynamicLibrary dllUser(wxT("user32"));
 628                     wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
 629                     if ( pfnSetMenuInfo )
 630                     {
 631                         mi.fMask = MIM_STYLE;
 632                         mi.dwStyle = MNS_CHECKORBMP;
 633                         if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
 634                         {
 635                             wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)"));
 636                         }
 637                     }
 638
 639                     // tell the item that it's not really owner-drawn but only
 640                     // needs to draw its bitmap, the rest is done by Windows
 641                     pItem->SetOwnerDrawn(false);
 642                 }
 643             }
 644         }
 645 #endif // __DMC__
 646
 647         if ( !ok )
 648         {
 649             // item draws itself, pass pointer to it in data parameter
 650             flags |= MF_OWNERDRAW;
 651             pData = (LPCTSTR)pItem;
 652
 653             bool updateAllMargins = false;
 654
 655             // get size of bitmap always return valid value (0 for invalid bitmap),
 656             // so we don't needed check if bitmap is valid ;)
 657             int uncheckedW = pItem->GetBitmap(false).GetWidth();
 658             int checkedW   = pItem->GetBitmap(true).GetWidth();
 659
 660             if ( m_maxBitmapWidth < uncheckedW )
 661             {
 662                 m_maxBitmapWidth = uncheckedW;
 663                 updateAllMargins = true;
 664             }
 665
 666             if ( m_maxBitmapWidth < checkedW )
 667             {
 668                 m_maxBitmapWidth = checkedW;
 669                 updateAllMargins = true;
 670             }
 671
 672             // make other item ownerdrawn and update margin width for equals alignment
 673             if ( !m_ownerDrawn || updateAllMargins )
 674             {
 675                 // we must use position in SetOwnerDrawnMenuItem because
 676                 // all separators have the same id
 677                 int pos = 0;
 678                 wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
 679                 while (node)
 680                 {
 681                     wxMenuItem* item = node->GetData();
 682
 683                     if ( !item->IsOwnerDrawn())
 684                     {
 685                         item->SetOwnerDrawn(true);
 686                         SetOwnerDrawnMenuItem(GetHmenu(), pos,
 687                                               reinterpret_cast<ULONG_PTR>(item), TRUE);
 688                     }
 689
 690                     item->SetMarginWidth(m_maxBitmapWidth);
 691
 692                     node = node->GetNext();
 693                     pos++;
 694                 }
 695
 696                 // set menu as ownerdrawn
 697                 m_ownerDrawn = true;
 698
 699                 // also ensure that the new item itself is made owner drawn
 700                 makeItemOwnerDrawn = true;
 701
 702                 ResetMaxAccelWidth();
 703             }
 704             // only update our margin for equals alignment to other item
 705             else if ( !updateAllMargins )
 706             {
 707                 pItem->SetMarginWidth(m_maxBitmapWidth);
 708             }
 709         }
 710     }
 711     else
 712 #endif // wxUSE_OWNER_DRAWN
 713     {
 714         // item is just a normal string (passed in data parameter)
 715         flags |= MF_STRING;
 716
 717 #ifdef __WXWINCE__
 718         itemText = wxMenuItem::GetLabelText(itemText);
 719 #endif
 720
 721         pData = itemText.t_str();
 722     }
 723
 724     // item might have already been inserted by InsertMenuItem() above
 725     if ( !ok )
 726     {
 727         if ( !::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData) )
 728         {
 729             wxLogLastError(wxT("InsertMenu[Item]()"));
 730
 731             return false;
 732         }
 733
 734 #if wxUSE_OWNER_DRAWN
 735         if ( makeItemOwnerDrawn )
 736         {
 737             SetOwnerDrawnMenuItem(GetHmenu(), pos,
 738                                   reinterpret_cast<ULONG_PTR>(pItem), TRUE);
 739         }
 740 #endif
 741     }
 742
 743
 744     // Check the item if it should be initially checked.
 745     if ( checkInitially )
 746         pItem->Check(true);
 747
 748     // if we just appended the title, highlight it
 749     if ( id == (UINT_PTR)idMenuTitle )
 750     {
 751         // visually select the menu title
 752         SetDefaultMenuItem(GetHmenu(), id);
 753     }
 754
 755     // if we're already attached to the menubar, we must update it
 756     if ( IsAttached() && GetMenuBar()->IsAttached() )
 757     {
 758         GetMenuBar()->Refresh();
 759     }
 760
 761     return true;
 762 }
 763
 764 wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 765 {
 766     return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item) ? item : NULL;
 767 }
 768
 769 wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 770 {
 771     if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos))
 772         return item;
 773     else
 774         return NULL;
 775 }
 776
 777 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 778 {
 779     // we need to find the item's position in the child list
 780     size_t pos;
 781     wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
 782     for ( pos = 0; node; pos++ )
 783     {
 784         if ( node->GetData() == item )
 785             break;
 786
 787         node = node->GetNext();
 788     }
 789
 790     // DoRemove() (unlike Remove) can only be called for an existing item!
 791     wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
 792
 793 #if wxUSE_ACCEL
 794     // remove the corresponding accel from the accel table
 795     int n = FindAccel(item->GetId());
 796     if ( n != wxNOT_FOUND )
 797     {
 798         delete m_accels[n];
 799
 800         m_accels.RemoveAt(n);
 801
 802 #if wxUSE_OWNER_DRAWN
 803         ResetMaxAccelWidth();
 804 #endif
 805     }
 806     //else: this item doesn't have an accel, nothing to do
 807 #endif // wxUSE_ACCEL
 808
 809     // remove the item from the menu
 810     if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
 811     {
 812         wxLogLastError(wxT("RemoveMenu"));
 813     }
 814
 815     if ( IsAttached() && GetMenuBar()->IsAttached() )
 816     {
 817         // otherwise, the change won't be visible
 818         GetMenuBar()->Refresh();
 819     }
 820
 821     // and from internal data structures
 822     return wxMenuBase::DoRemove(item);
 823 }
 824
 825 // ---------------------------------------------------------------------------
 826 // accelerator helpers
 827 // ---------------------------------------------------------------------------
 828
 829 #if wxUSE_ACCEL
 830
 831 // create the wxAcceleratorEntries for our accels and put them into the provided
 832 // array - return the number of accels we have
 833 size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const
 834 {
 835     size_t count = GetAccelCount();
 836     for ( size_t n = 0; n < count; n++ )
 837     {
 838         *accels++ = *m_accels[n];
 839     }
 840
 841     return count;
 842 }
 843
 844 wxAcceleratorTable *wxMenu::CreateAccelTable() const
 845 {
 846     const size_t count = m_accels.size();
 847     wxScopedArray<wxAcceleratorEntry> accels(new wxAcceleratorEntry[count]);
 848     CopyAccels(accels.get());
 849
 850     return new wxAcceleratorTable(count, accels.get());
 851 }
 852
 853 #endif // wxUSE_ACCEL
 854
 855 // ---------------------------------------------------------------------------
 856 // ownerdrawn helpers
 857 // ---------------------------------------------------------------------------
 858
 859 #if wxUSE_OWNER_DRAWN
 860
 861 void wxMenu::CalculateMaxAccelWidth()
 862 {
 863     wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") );
 864
 865     wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
 866     while (node)
 867     {
 868         wxMenuItem* item = node->GetData();
 869
 870         if ( item->IsOwnerDrawn() )
 871         {
 872             int width = item->MeasureAccelWidth();
 873             if (width > m_maxAccelWidth )
 874                 m_maxAccelWidth = width;
 875         }
 876
 877         node = node->GetNext();
 878     }
 879 }
 880
 881 #endif // wxUSE_OWNER_DRAWN
 882
 883 // ---------------------------------------------------------------------------
 884 // set wxMenu title
 885 // ---------------------------------------------------------------------------
 886
 887 void wxMenu::SetTitle(const wxString& label)
 888 {
 889     bool hasNoTitle = m_title.empty();
 890     m_title = label;
 891
 892     HMENU hMenu = GetHmenu();
 893
 894     if ( hasNoTitle )
 895     {
 896         if ( !label.empty() )
 897         {
 898             if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
 899                                (UINT_PTR)idMenuTitle, m_title.t_str()) ||
 900                  !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
 901             {
 902                 wxLogLastError(wxT("InsertMenu"));
 903             }
 904         }
 905     }
 906     else
 907     {
 908         if ( label.empty() )
 909         {
 910             // remove the title and the separator after it
 911             if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
 912                  !RemoveMenu(hMenu, 0, MF_BYPOSITION) )
 913             {
 914                 wxLogLastError(wxT("RemoveMenu"));
 915             }
 916         }
 917         else
 918         {
 919             // modify the title
 920 #ifdef __WXWINCE__
 921             WinStruct<MENUITEMINFO> info;
 922             info.fMask = MIIM_TYPE;
 923             info.fType = MFT_STRING;
 924             info.cch = m_title.length();
 925             info.dwTypeData = wxMSW_CONV_LPTSTR(m_title);
 926             if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
 927             {
 928                 wxLogLastError(wxT("SetMenuItemInfo"));
 929             }
 930 #else
 931             if ( !ModifyMenu(hMenu, 0u,
 932                              MF_BYPOSITION | MF_STRING,
 933                              (UINT_PTR)idMenuTitle, m_title.t_str()) )
 934             {
 935                 wxLogLastError(wxT("ModifyMenu"));
 936             }
 937 #endif
 938         }
 939     }
 940
 941 #ifdef __WIN32__
 942     // put the title string in bold face
 943     if ( !m_title.empty() )
 944     {
 945         SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle);
 946     }
 947 #endif // Win32
 948 }
 949
 950 // ---------------------------------------------------------------------------
 951 // event processing
 952 // ---------------------------------------------------------------------------
 953
 954 bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)
 955 {
 956     const int id = (signed short)id_;
 957
 958     // ignore commands from the menu title
 959     if ( id != idMenuTitle )
 960     {
 961         // Default value for uncheckable items.
 962         int checked = -1;
 963
 964         // update the check item when it's clicked
 965         wxMenuItem * const item = FindItem(id);
 966         if ( item && item->IsCheckable() )
 967         {
 968             item->Toggle();
 969
 970             // Get the status of the menu item: note that it has been just changed
 971             // by Toggle() above so here we already get the new state of the item.
 972             //
 973             // Also notice that we must pass unsigned id_ and not sign-extended id
 974             // to ::GetMenuState() as this is what it expects.
 975             UINT menuState = ::GetMenuState(GetHmenu(), id_, MF_BYCOMMAND);
 976             checked = (menuState & MF_CHECKED) != 0;
 977         }
 978
 979         SendEvent(id, checked);
 980     }
 981
 982     return true;
 983 }
 984
 985 // get the menu with given handle (recursively)
 986 #if wxUSE_OWNER_DRAWN
 987 wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu)
 988 {
 989     // check self
 990     if ( GetHMenu() == hMenu )
 991         return this;
 992
 993     // recursively query submenus
 994     for ( size_t n = 0 ; n < GetMenuItemCount(); ++n )
 995     {
 996         wxMenuItem* item = FindItemByPosition(n);
 997         wxMenu* submenu = item->GetSubMenu();
 998         if ( submenu )
 999         {
1000             submenu = submenu->MSWGetMenu(hMenu);
1001             if (submenu)
1002                 return submenu;
1003         }
1004     }
1005
1006     // unknown hMenu
1007     return NULL;
1008 }
1009 #endif // wxUSE_OWNER_DRAWN
1010
1011 // ---------------------------------------------------------------------------
1012 // Menu Bar
1013 // ---------------------------------------------------------------------------
1014
1015 void wxMenuBar::Init()
1016 {
1017     m_eventHandler = this;
1018     m_hMenu = 0;
1019 #if wxUSE_TOOLBAR && defined(__WXWINCE__)
1020     m_toolBar = NULL;
1021 #endif
1022     // Not using a combined wxToolBar/wxMenuBar? then use
1023     // a commandbar in WinCE .NET just to implement the
1024     // menubar.
1025 #if defined(WINCE_WITH_COMMANDBAR)
1026     m_commandBar = NULL;
1027     m_adornmentsAdded = false;
1028 #endif
1029 }
1030
1031 wxMenuBar::wxMenuBar()
1032 {
1033     Init();
1034 }
1035
1036 wxMenuBar::wxMenuBar( long WXUNUSED(style) )
1037 {
1038     Init();
1039 }
1040
1041 wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))
1042 {
1043     Init();
1044
1045     for ( size_t i = 0; i < count; i++ )
1046     {
1047         // We just want to store the menu title in the menu itself, not to
1048         // show it as a dummy item in the menu itself as we do with the popup
1049         // menu titles in overridden wxMenu::SetTitle().
1050         menus[i]->wxMenuBase::SetTitle(titles[i]);
1051         m_menus.Append(menus[i]);
1052
1053         menus[i]->Attach(this);
1054     }
1055 }
1056
1057 wxMenuBar::~wxMenuBar()
1058 {
1059     // In Windows CE (not .NET), the menubar is always associated
1060     // with a toolbar, which destroys the menu implicitly.
1061 #if defined(WINCE_WITHOUT_COMMANDBAR) && defined(__POCKETPC__)
1062     if (GetToolBar())
1063     {
1064         wxToolMenuBar* toolMenuBar = wxDynamicCast(GetToolBar(), wxToolMenuBar);
1065         if (toolMenuBar)
1066             toolMenuBar->SetMenuBar(NULL);
1067     }
1068 #else
1069     // we should free Windows resources only if Windows doesn't do it for us
1070     // which happens if we're attached to a frame
1071     if (m_hMenu && !IsAttached())
1072     {
1073 #if defined(WINCE_WITH_COMMANDBAR)
1074         ::DestroyWindow((HWND) m_commandBar);
1075         m_commandBar = (WXHWND) NULL;
1076 #else
1077         ::DestroyMenu((HMENU)m_hMenu);
1078 #endif
1079         m_hMenu = (WXHMENU)NULL;
1080     }
1081 #endif
1082 }
1083
1084 // ---------------------------------------------------------------------------
1085 // wxMenuBar helpers
1086 // ---------------------------------------------------------------------------
1087
1088 void wxMenuBar::Refresh()
1089 {
1090     if ( IsFrozen() )
1091         return;
1092
1093     wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
1094
1095 #if defined(WINCE_WITHOUT_COMMANDBAR)
1096     if (GetToolBar())
1097     {
1098         CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0);
1099     }
1100 #elif defined(WINCE_WITH_COMMANDBAR)
1101     if (m_commandBar)
1102         DrawMenuBar((HWND) m_commandBar);
1103 #else
1104     DrawMenuBar(GetHwndOf(GetFrame()));
1105 #endif
1106 }
1107
1108 WXHMENU wxMenuBar::Create()
1109 {
1110     // Note: this doesn't work at all on Smartphone,
1111     // since you have to use resources.
1112     // We'll have to find another way to add a menu
1113     // by changing/adding menu items to an existing menu.
1114 #if defined(WINCE_WITHOUT_COMMANDBAR)
1115     if ( m_hMenu != 0 )
1116         return m_hMenu;
1117
1118     wxToolMenuBar * const bar = static_cast<wxToolMenuBar *>(GetToolBar());
1119     if ( !bar )
1120         return NULL;
1121
1122     HWND hCommandBar = GetHwndOf(bar);
1123
1124     // notify comctl32.dll about the version of the headers we use before using
1125     // any other TB_XXX messages
1126     SendMessage(hCommandBar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
1127
1128     TBBUTTON tbButton;
1129     wxZeroMemory(tbButton);
1130     tbButton.iBitmap = I_IMAGENONE;
1131     tbButton.fsState = TBSTATE_ENABLED;
1132     tbButton.fsStyle = TBSTYLE_DROPDOWN |
1133                        TBSTYLE_NO_DROPDOWN_ARROW |
1134                        TBSTYLE_AUTOSIZE;
1135
1136     for ( unsigned i = 0; i < GetMenuCount(); i++ )
1137     {
1138         HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu();
1139         tbButton.dwData = (DWORD)hPopupMenu;
1140         wxString label = wxStripMenuCodes(GetMenuLabel(i));
1141         tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
1142
1143         tbButton.idCommand = NewControlId();
1144         if ( !::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton) )
1145         {
1146             wxLogLastError(wxT("TB_INSERTBUTTON"));
1147         }
1148     }
1149
1150     m_hMenu = bar->GetHMenu();
1151     return m_hMenu;
1152 #else // !__WXWINCE__
1153     if ( m_hMenu != 0 )
1154         return m_hMenu;
1155
1156     m_hMenu = (WXHMENU)::CreateMenu();
1157
1158     if ( !m_hMenu )
1159     {
1160         wxLogLastError(wxT("CreateMenu"));
1161     }
1162     else
1163     {
1164         for ( wxMenuList::iterator it = m_menus.begin();
1165               it != m_menus.end();
1166               ++it )
1167         {
1168             if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
1169                                (UINT_PTR)(*it)->GetHMenu(),
1170                                (*it)->GetTitle().t_str()) )
1171             {
1172                 wxLogLastError(wxT("AppendMenu"));
1173             }
1174         }
1175     }
1176
1177     return m_hMenu;
1178 #endif // __WXWINCE__/!__WXWINCE__
1179 }
1180
1181 int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
1182 {
1183     wxASSERT(menu);
1184     wxASSERT(menu->GetHMenu());
1185     wxASSERT(m_hMenu);
1186
1187 #if defined(__WXWINCE__)
1188     int totalMSWItems = GetMenuCount();
1189 #else
1190     int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu);
1191 #endif
1192
1193     int i; // For old C++ compatibility
1194     for(i=wxpos; i<totalMSWItems; i++)
1195     {
1196         if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
1197             return i;
1198     }
1199     for(i=0; i<wxpos; i++)
1200     {
1201         if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
1202             return i;
1203     }
1204     wxFAIL;
1205     return -1;
1206 }
1207
1208 // ---------------------------------------------------------------------------
1209 // wxMenuBar functions to work with the top level submenus
1210 // ---------------------------------------------------------------------------
1211
1212 // NB: we don't support owner drawn top level items for now, if we do these
1213 //     functions would have to be changed to use wxMenuItem as well
1214
1215 void wxMenuBar::EnableTop(size_t pos, bool enable)
1216 {
1217     wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
1218     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
1219
1220     int flag = enable ? MF_ENABLED : MF_GRAYED;
1221
1222     EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag);
1223
1224     Refresh();
1225 }
1226
1227 bool wxMenuBar::IsEnabledTop(size_t pos) const
1228 {
1229     wxCHECK_MSG( pos < GetMenuCount(), false, wxS("invalid menu index") );
1230     WinStruct<MENUITEMINFO> mii;
1231     mii.fMask = MIIM_STATE;
1232     if ( !::GetMenuItemInfo(GetHmenu(), pos, TRUE, &mii) )
1233     {
1234         wxLogLastError(wxS("GetMenuItemInfo(menubar)"));
1235     }
1236
1237     return !(mii.fState & MFS_GRAYED);
1238 }
1239
1240 void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
1241 {
1242     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
1243
1244     m_menus[pos]->wxMenuBase::SetTitle(label);
1245
1246     if ( !IsAttached() )
1247     {
1248         return;
1249     }
1250     //else: have to modify the existing menu
1251
1252     int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
1253
1254     UINT_PTR id;
1255     UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
1256     if ( flagsOld == 0xFFFFFFFF )
1257     {
1258         wxLogLastError(wxT("GetMenuState"));
1259
1260         return;
1261     }
1262
1263     if ( flagsOld & MF_POPUP )
1264     {
1265         // HIBYTE contains the number of items in the submenu in this case
1266         flagsOld &= 0xff;
1267         id = (UINT_PTR)::GetSubMenu((HMENU)m_hMenu, mswpos);
1268     }
1269     else
1270     {
1271         id = pos;
1272     }
1273
1274 #ifdef __WXWINCE__
1275     WinStruct<MENUITEMINFO> info;
1276     info.fMask = MIIM_TYPE;
1277     info.fType = MFT_STRING;
1278     info.cch = label.length();
1279     info.dwTypeData = wxMSW_CONV_LPTSTR(label);
1280     if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, &info) )
1281     {
1282         wxLogLastError(wxT("SetMenuItemInfo"));
1283     }
1284
1285 #else
1286     if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
1287                       id, label.t_str()) == (int)0xFFFFFFFF )
1288     {
1289         wxLogLastError(wxT("ModifyMenu"));
1290     }
1291 #endif
1292
1293     Refresh();
1294 }
1295
1296 wxString wxMenuBar::GetMenuLabel(size_t pos) const
1297 {
1298     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
1299                  wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
1300
1301     return m_menus[pos]->GetTitle();
1302 }
1303
1304 // ---------------------------------------------------------------------------
1305 // wxMenuBar construction
1306 // ---------------------------------------------------------------------------
1307
1308 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
1309 {
1310     wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
1311     if ( !menuOld )
1312         return NULL;
1313
1314     menu->wxMenuBase::SetTitle(title);
1315
1316 #if defined(WINCE_WITHOUT_COMMANDBAR)
1317     if (IsAttached())
1318 #else
1319     if (GetHmenu())
1320 #endif
1321     {
1322         int mswpos = MSWPositionForWxMenu(menuOld,pos);
1323
1324         // can't use ModifyMenu() because it deletes the submenu it replaces
1325         if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) )
1326         {
1327             wxLogLastError(wxT("RemoveMenu"));
1328         }
1329
1330         if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
1331                            MF_BYPOSITION | MF_POPUP | MF_STRING,
1332                            (UINT_PTR)GetHmenuOf(menu), title.t_str()) )
1333         {
1334             wxLogLastError(wxT("InsertMenu"));
1335         }
1336
1337 #if wxUSE_ACCEL
1338         if ( menuOld->HasAccels() || menu->HasAccels() )
1339         {
1340             // need to rebuild accell table
1341             RebuildAccelTable();
1342         }
1343 #endif // wxUSE_ACCEL
1344
1345         if (IsAttached())
1346             Refresh();
1347     }
1348
1349     return menuOld;
1350 }
1351
1352 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
1353 {
1354     // Find out which MSW item before which we'll be inserting before
1355     // wxMenuBarBase::Insert is called and GetMenu(pos) is the new menu.
1356     // If IsAttached() is false this won't be used anyway
1357     bool isAttached =
1358 #if defined(WINCE_WITHOUT_COMMANDBAR)
1359         IsAttached();
1360 #else
1361         (GetHmenu() != 0);
1362 #endif
1363
1364     int mswpos = (!isAttached || (pos == m_menus.GetCount()))
1365         ?   -1 // append the menu
1366         :   MSWPositionForWxMenu(GetMenu(pos),pos);
1367
1368     if ( !wxMenuBarBase::Insert(pos, menu, title) )
1369         return false;
1370
1371     menu->wxMenuBase::SetTitle(title);
1372
1373     if ( isAttached )
1374     {
1375 #if defined(WINCE_WITHOUT_COMMANDBAR)
1376         if (!GetToolBar())
1377             return false;
1378         TBBUTTON tbButton;
1379         memset(&tbButton, 0, sizeof(TBBUTTON));
1380         tbButton.iBitmap = I_IMAGENONE;
1381         tbButton.fsState = TBSTATE_ENABLED;
1382         tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
1383
1384         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
1385         tbButton.dwData = (DWORD)hPopupMenu;
1386         wxString label = wxStripMenuCodes(title);
1387         tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
1388
1389         tbButton.idCommand = NewControlId();
1390         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
1391         {
1392             wxLogLastError(wxT("TB_INSERTBUTTON"));
1393             return false;
1394         }
1395         wxUnusedVar(mswpos);
1396 #else
1397         if ( !::InsertMenu(GetHmenu(), mswpos,
1398                            MF_BYPOSITION | MF_POPUP | MF_STRING,
1399                            (UINT_PTR)GetHmenuOf(menu), title.t_str()) )
1400         {
1401             wxLogLastError(wxT("InsertMenu"));
1402         }
1403 #endif
1404 #if wxUSE_ACCEL
1405         if ( menu->HasAccels() )
1406         {
1407             // need to rebuild accell table
1408             RebuildAccelTable();
1409         }
1410 #endif // wxUSE_ACCEL
1411
1412         if (IsAttached())
1413             Refresh();
1414     }
1415
1416     return true;
1417 }
1418
1419 bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
1420 {
1421     WXHMENU submenu = menu ? menu->GetHMenu() : 0;
1422     wxCHECK_MSG( submenu, false, wxT("can't append invalid menu to menubar") );
1423
1424     if ( !wxMenuBarBase::Append(menu, title) )
1425         return false;
1426
1427     menu->wxMenuBase::SetTitle(title);
1428
1429 #if defined(WINCE_WITHOUT_COMMANDBAR)
1430     if (IsAttached())
1431 #else
1432     if (GetHmenu())
1433 #endif
1434     {
1435 #if defined(WINCE_WITHOUT_COMMANDBAR)
1436         if (!GetToolBar())
1437             return false;
1438         TBBUTTON tbButton;
1439         memset(&tbButton, 0, sizeof(TBBUTTON));
1440         tbButton.iBitmap = I_IMAGENONE;
1441         tbButton.fsState = TBSTATE_ENABLED;
1442         tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
1443
1444         size_t pos = GetMenuCount();
1445         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
1446         tbButton.dwData = (DWORD)hPopupMenu;
1447         wxString label = wxStripMenuCodes(title);
1448         tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
1449
1450         tbButton.idCommand = NewControlId();
1451         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
1452         {
1453             wxLogLastError(wxT("TB_INSERTBUTTON"));
1454             return false;
1455         }
1456 #else
1457         if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
1458                            (UINT_PTR)submenu, title.t_str()) )
1459         {
1460             wxLogLastError(wxT("AppendMenu"));
1461         }
1462 #endif
1463
1464 #if wxUSE_ACCEL
1465         if ( menu->HasAccels() )
1466         {
1467             // need to rebuild accelerator table
1468             RebuildAccelTable();
1469         }
1470 #endif // wxUSE_ACCEL
1471
1472         if (IsAttached())
1473             Refresh();
1474     }
1475
1476     return true;
1477 }
1478
1479 wxMenu *wxMenuBar::Remove(size_t pos)
1480 {
1481     wxMenu *menu = wxMenuBarBase::Remove(pos);
1482     if ( !menu )
1483         return NULL;
1484
1485 #if defined(WINCE_WITHOUT_COMMANDBAR)
1486     if (IsAttached())
1487 #else
1488     if (GetHmenu())
1489 #endif
1490     {
1491 #if defined(WINCE_WITHOUT_COMMANDBAR)
1492         if (GetToolBar())
1493         {
1494             if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0))
1495             {
1496                 wxLogLastError(wxT("TB_DELETEBUTTON"));
1497             }
1498         }
1499 #else
1500         if ( !::RemoveMenu(GetHmenu(), (UINT)MSWPositionForWxMenu(menu,pos), MF_BYPOSITION) )
1501         {
1502             wxLogLastError(wxT("RemoveMenu"));
1503         }
1504 #endif
1505
1506 #if wxUSE_ACCEL
1507         if ( menu->HasAccels() )
1508         {
1509             // need to rebuild accell table
1510             RebuildAccelTable();
1511         }
1512 #endif // wxUSE_ACCEL
1513
1514         if (IsAttached())
1515             Refresh();
1516     }
1517
1518     return menu;
1519 }
1520
1521 #if wxUSE_ACCEL
1522
1523 void wxMenuBar::RebuildAccelTable()
1524 {
1525     // merge the accelerators of all menus into one accel table
1526     size_t nAccelCount = 0;
1527     size_t i, count = GetMenuCount();
1528     wxMenuList::iterator it;
1529     for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
1530     {
1531         nAccelCount += (*it)->GetAccelCount();
1532     }
1533
1534     if ( nAccelCount )
1535     {
1536         wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
1537
1538         nAccelCount = 0;
1539         for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
1540         {
1541             nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
1542         }
1543
1544         SetAcceleratorTable(wxAcceleratorTable(nAccelCount, accelEntries));
1545
1546         delete [] accelEntries;
1547     }
1548     else // No (more) accelerators.
1549     {
1550         SetAcceleratorTable(wxAcceleratorTable());
1551     }
1552 }
1553
1554 #endif // wxUSE_ACCEL
1555
1556 void wxMenuBar::Attach(wxFrame *frame)
1557 {
1558     wxMenuBarBase::Attach(frame);
1559
1560 #if defined(WINCE_WITH_COMMANDBAR)
1561     if (!m_hMenu)
1562         this->Create();
1563     if (!m_commandBar)
1564         m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId());
1565     if (m_commandBar)
1566     {
1567         if (m_hMenu)
1568         {
1569             if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, (LPTSTR) m_hMenu, 0))
1570             {
1571                 wxLogLastError(wxT("CommandBar_InsertMenubarEx"));
1572             }
1573         }
1574     }
1575 #endif
1576
1577 #if wxUSE_ACCEL
1578     RebuildAccelTable();
1579 #endif // wxUSE_ACCEL
1580 }
1581
1582 #if defined(WINCE_WITH_COMMANDBAR)
1583 bool wxMenuBar::AddAdornments(long style)
1584 {
1585     if (m_adornmentsAdded || !m_commandBar)
1586         return false;
1587
1588     if (style & wxCLOSE_BOX)
1589     {
1590         if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0))
1591         {
1592             wxLogLastError(wxT("CommandBar_AddAdornments"));
1593         }
1594         else
1595         {
1596             return true;
1597         }
1598     }
1599     return false;
1600 }
1601 #endif
1602
1603 void wxMenuBar::Detach()
1604 {
1605     wxMenuBarBase::Detach();
1606 }
1607
1608 // get the menu with given handle (recursively)
1609 wxMenu* wxMenuBar::MSWGetMenu(WXHMENU hMenu)
1610 {
1611     wxCHECK_MSG( GetHMenu() != hMenu, NULL,
1612                  wxT("wxMenuBar::MSWGetMenu(): menu handle is wxMenuBar, not wxMenu") );
1613
1614 #if wxUSE_OWNER_DRAWN
1615     // query all menus
1616     for ( size_t n = 0 ; n < GetMenuCount(); ++n )
1617     {
1618         wxMenu* menu = GetMenu(n)->MSWGetMenu(hMenu);
1619         if ( menu )
1620             return menu;
1621     }
1622 #endif
1623
1624     // unknown hMenu
1625     return NULL;
1626 }
1627
1628 #endif // wxUSE_MENUS