Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.

[wxWidgets.git] / src / msw / menu.cpp

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 28581bd470261c959f2bfdcc5b5380551852a74c..8798b7d2ce2652ebee1bf3a82246f4e54b2f8ae1 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -29,18 +29,22 @@
 #include "wx/menu.h"
 
 #ifndef WX_PRECOMP
 #include "wx/menu.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"

     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/image.h"

 #endif
 
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 #endif
 
 #endif
 
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 #endif
 

+#include "wx/scopedarray.h"
+#include "wx/vector.h"
+

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"

 
 #ifdef __WXWINCE__
 #include <windows.h>
 
 #ifdef __WXWINCE__
 #include <windows.h>


@@ -59,7 +63,7 @@
 // other standard headers
 #include <string.h>
 
 // other standard headers
 #include <string.h>
 

-#if wxUSE_OWNER_DRAWN && defined(MIIM_BITMAP)
+#if wxUSE_OWNER_DRAWN

     #include "wx/dynlib.h"
 #endif
 
     #include "wx/dynlib.h"
 #endif
 


@@ -79,151 +83,192 @@
 // ----------------------------------------------------------------------------
 
 // the (popup) menu title has this special id
 // ----------------------------------------------------------------------------
 
 // the (popup) menu title has this special id

-static const int idMenuTitle = -3;
+static const int idMenuTitle = wxID_NONE;

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// private functions
+// private helper classes and functions

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// make the given menu item default
-static void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
-                               UINT WXUNUSED_IN_WINCE(id))
-{
-#ifndef __WXWINCE__
-    MENUITEMINFO mii;
-    wxZeroMemory(mii);
-    mii.cbSize = sizeof(MENUITEMINFO);
-    mii.fMask = MIIM_STATE;
-    mii.fState = MFS_DEFAULT;
-
-    if ( !::SetMenuItemInfo(hmenu, id, FALSE, &mii) )
-    {
-        wxLogLastError(wxT("SetMenuItemInfo"));
-    }
-#endif
-}
-
-#ifdef __WXWINCE__
-UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
+// Contains the data about the radio items groups in the given menu.
+class wxMenuRadioItemsData

 {
 {

-    MENUITEMINFO info;
-    wxZeroMemory(info);
-    info.cbSize = sizeof(info);
-    info.fMask = MIIM_STATE;
-    // MF_BYCOMMAND is zero so test MF_BYPOSITION
-    if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) )
-        wxLogLastError(wxT("GetMenuItemInfo"));
-    return info.fState;
-}
-#endif
+public:
+    wxMenuRadioItemsData() { }

 
 

-// ============================================================================
-// implementation
-// ============================================================================
+    // Default copy ctor, assignment operator and dtor are all ok.

 
 

-#include "wx/listimpl.cpp"
+    // Find the start and end of the group containing the given position or
+    // return false if it's not inside any range.
+    bool GetGroupRange(int pos, int *start, int *end) const
+    {
+        // We use a simple linear search here because there are not that many
+        // items in a menu and hence even fewer radio items ranges anyhow, so
+        // normally there is no need to do anything fancy (like keeping the
+        // array sorted and using binary search).
+        for ( Ranges::const_iterator it = m_ranges.begin();
+              it != m_ranges.end();
+              ++it )
+        {
+            const Range& r = *it;

 
 

-WX_DEFINE_LIST( wxMenuInfoList )
+            if ( r.start <= pos && pos <= r.end )
+            {
+                if ( start )
+                    *start = r.start;
+                if ( end )
+                    *end = r.end;

 
 

-#if wxUSE_EXTENDED_RTTI
+                return true;
+            }
+        }

 
 

-WX_DEFINE_FLAGS( wxMenuStyle )
+        return false;
+    }

 
 

-wxBEGIN_FLAGS( wxMenuStyle )
-    wxFLAGS_MEMBER(wxMENU_TEAROFF)
-wxEND_FLAGS( wxMenuStyle )
+    // Take into account the new radio item about to be added at the given
+    // position.
+    //
+    // Returns true if this item starts a new radio group, false if it extends
+    // an existing one.
+    bool UpdateOnInsert(int pos)
+    {
+        bool inExistingGroup = false;

 
 

-IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler,"wx/menu.h")
+        for ( Ranges::iterator it = m_ranges.begin();
+              it != m_ranges.end();
+              ++it )
+        {
+            Range& r = *it;

 
 

-wxCOLLECTION_TYPE_INFO( wxMenuItem * , wxMenuItemList ) ;
+            if ( pos < r.start )
+            {
+                // Item is inserted before this range, update its indices.
+                r.start++;
+                r.end++;
+            }
+            else if ( pos <= r.end + 1 )
+            {
+                // Item is inserted in the middle of this range or immediately
+                // after it in which case it extends this range so make it span
+                // one more item in any case.
+                r.end++;

 
 

-template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVariantArray &value)
-{
-    wxListCollectionToVariantArray<wxMenuItemList::compatibility_iterator>( theList , value ) ;
-}
+                inExistingGroup = true;
+            }
+            //else: Item is inserted after this range, nothing to do for it.
+        }

 
 

-wxBEGIN_PROPERTIES_TABLE(wxMenu)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
-    wxPROPERTY( Title, wxString , SetTitle, GetTitle, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-    wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
+        if ( inExistingGroup )
+            return false;

 
 

-wxBEGIN_HANDLERS_TABLE(wxMenu)
-wxEND_HANDLERS_TABLE()
+        // Make a new range for the group this item will belong to.
+        Range r;
+        r.start = pos;
+        r.end = pos;
+        m_ranges.push_back(r);

 
 

-wxDIRECT_CONSTRUCTOR_2( wxMenu , wxString , Title , long , MenuStyle  )
+        return true;
+    }

 
 

-WX_DEFINE_FLAGS( wxMenuBarStyle )
+private:
+    // Contains the inclusive positions of the range start and end.
+    struct Range
+    {
+        int start;
+        int end;
+    };

 
 

-wxBEGIN_FLAGS( wxMenuBarStyle )
-    wxFLAGS_MEMBER(wxMB_DOCKABLE)
-wxEND_FLAGS( wxMenuBarStyle )
+    typedef wxVector<Range> Ranges;
+    Ranges m_ranges;
+};

 
 

-// the negative id would lead the window (its superclass !) to vetoe streaming out otherwise
-bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxWriter * , wxPersister * , wxxVariantArray & )
+namespace

 {
 {

-    return true ;
-}
-
-IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow ,"wx/menu.h",wxMenuBarStreamingCallback)
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject , "wx/menu.h" )
-
-wxBEGIN_PROPERTIES_TABLE(wxMenuInfo)
-    wxREADONLY_PROPERTY( Menu , wxMenu* , GetMenu , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxREADONLY_PROPERTY( Title , wxString , GetTitle , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()

 
 

-wxBEGIN_HANDLERS_TABLE(wxMenuInfo)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title )
-
-wxCOLLECTION_TYPE_INFO( wxMenuInfo * , wxMenuInfoList ) ;
-
-template<> void wxCollectionToVariantArray( wxMenuInfoList const &theList, wxxVariantArray &value)
+// make the given menu item default
+void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
+                        UINT WXUNUSED_IN_WINCE(id))

 {
 {

-    wxListCollectionToVariantArray<wxMenuInfoList::compatibility_iterator>( theList , value ) ;
-}
+#ifndef __WXWINCE__
+    WinStruct<MENUITEMINFO> mii;
+    mii.fMask = MIIM_STATE;
+    mii.fState = MFS_DEFAULT;

 
 

-wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
-    wxPROPERTY_COLLECTION( MenuInfos , wxMenuInfoList , wxMenuInfo* , Append , GetMenuInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
+    if ( !::SetMenuItemInfo(hmenu, id, FALSE, &mii) )
+    {
+        wxLogLastError(wxT("SetMenuItemInfo"));
+    }
+#endif // !__WXWINCE__
+}

 
 

-wxBEGIN_HANDLERS_TABLE(wxMenuBar)
-wxEND_HANDLERS_TABLE()
+// make the given menu item owner-drawn
+void SetOwnerDrawnMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
+                           UINT WXUNUSED_IN_WINCE(id),
+                           ULONG_PTR WXUNUSED_IN_WINCE(data),
+                           BOOL WXUNUSED_IN_WINCE(byPositon = FALSE))
+{
+#ifndef __WXWINCE__
+    WinStruct<MENUITEMINFO> mii;
+    mii.fMask = MIIM_FTYPE | MIIM_DATA;
+    mii.fType = MFT_OWNERDRAW;
+    mii.dwItemData = data;

 
 

-wxCONSTRUCTOR_DUMMY( wxMenuBar )
+    if ( reinterpret_cast<wxMenuItem*>(data)->IsSeparator() )
+        mii.fType |= MFT_SEPARATOR;

 
 

-#else
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject)
-#endif
+    if ( !::SetMenuItemInfo(hmenu, id, byPositon, &mii) )
+    {
+        wxLogLastError(wxT("SetMenuItemInfo"));
+    }
+#endif // !__WXWINCE__
+}

 
 

-const wxMenuInfoList& wxMenuBar::GetMenuInfos() const
+#ifdef __WXWINCE__
+UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)

 {
 {

-    wxMenuInfoList* list = const_cast< wxMenuInfoList* >( &m_menuInfos ) ;
-    WX_CLEAR_LIST( wxMenuInfoList , *list ) ;
-    for( size_t i = 0 ; i < GetMenuCount() ; ++i )
+    WinStruct<MENUITEMINFO> info;
+    info.fMask = MIIM_STATE;
+    // MF_BYCOMMAND is zero so test MF_BYPOSITION
+    if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) )

     {
     {

-        wxMenuInfo* info = new wxMenuInfo() ;
-        info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetLabelTop(i) ) ;
-        list->Append( info ) ;
+        wxLogLastError(wxT("GetMenuItemInfo"));

     }
     }

-    return m_menuInfos ;
+    return info.fState;
+}
+#endif // __WXWINCE__
+
+inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
+{
+    return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
+            bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);

 }
 
 }
 

+} // anonymous namespace
+
+// ============================================================================
+// implementation
+// ============================================================================
+

 // ---------------------------------------------------------------------------
 // wxMenu construction, adding and removing menu items
 // ---------------------------------------------------------------------------
 
 // Construct a menu with optional title (then use append)
 // ---------------------------------------------------------------------------
 // wxMenu construction, adding and removing menu items
 // ---------------------------------------------------------------------------
 
 // Construct a menu with optional title (then use append)

-void wxMenu::Init()
+void wxMenu::InitNoCreate()

 {
 {

+    m_radioData = NULL;

     m_doBreak = false;
     m_doBreak = false;

-    m_startRadioGroup = -1;
+
+#if wxUSE_OWNER_DRAWN
+    m_ownerDrawn = false;
+    m_maxBitmapWidth = 0;
+    m_maxAccelWidth = -1;
+#endif // wxUSE_OWNER_DRAWN
+}
+
+void wxMenu::Init()
+{
+    InitNoCreate();

 
     // create the menu
     m_hMenu = (WXHMENU)CreatePopupMenu();
 
     // create the menu
     m_hMenu = (WXHMENU)CreatePopupMenu();


@@ -235,8 +280,27 @@ void wxMenu::Init()
     // if we have a title, insert it in the beginning of the menu
     if ( !m_title.empty() )
     {
     // if we have a title, insert it in the beginning of the menu
     if ( !m_title.empty() )
     {

-        Append(idMenuTitle, m_title);
-        AppendSeparator();
+        const wxString title = m_title;
+        m_title.clear(); // so that SetTitle() knows there was no title before
+        SetTitle(title);
+    }
+}
+
+wxMenu::wxMenu(WXHMENU hMenu)
+{
+    InitNoCreate();
+
+    m_hMenu = hMenu;
+
+    // Ensure that our internal idea of how many items we have corresponds to
+    // the real number of items in the menu.
+    //
+    // We could also retrieve the real labels of the items here but it doesn't
+    // seem to be worth the trouble.
+    const int numExistingItems = ::GetMenuItemCount(m_hMenu);
+    for ( int n = 0; n < numExistingItems; n++ )
+    {
+        wxMenuBase::DoAppend(wxMenuItem::New(this, wxID_SEPARATOR));

     }
 }
 
     }
 }
 


@@ -258,6 +322,8 @@ wxMenu::~wxMenu()
     // delete accels
     WX_CLEAR_ARRAY(m_accels);
 #endif // wxUSE_ACCEL
     // delete accels
     WX_CLEAR_ARRAY(m_accels);
 #endif // wxUSE_ACCEL

+
+    delete m_radioData;

 }
 
 void wxMenu::Break()
 }
 
 void wxMenu::Break()


@@ -266,13 +332,6 @@ void wxMenu::Break()
     m_doBreak = true;
 }
 
     m_doBreak = true;
 }
 

-void wxMenu::Attach(wxMenuBarBase *menubar)
-{
-    wxMenuBase::Attach(menubar);
-
-    EndRadioGroup();
-}
-

 #if wxUSE_ACCEL
 
 int wxMenu::FindAccel(int id) const
 #if wxUSE_ACCEL
 
 int wxMenu::FindAccel(int id) const


@@ -313,7 +372,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
         }
 
         // find the (new) accel for this item
         }
 
         // find the (new) accel for this item

-        wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetText());
+        wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetItemLabel());

         if ( accel )
             accel->m_command = item->GetId();
 
         if ( accel )
             accel->m_command = item->GetId();
 


@@ -341,12 +400,69 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
         {
             GetMenuBar()->RebuildAccelTable();
         }
         {
             GetMenuBar()->RebuildAccelTable();
         }

+
+#if wxUSE_OWNER_DRAWN
+        ResetMaxAccelWidth();
+#endif

     }
     //else: it is a separator, they can't have accels, nothing to do
 }
 
 #endif // wxUSE_ACCEL
 
     }
     //else: it is a separator, they can't have accels, nothing to do
 }
 
 #endif // wxUSE_ACCEL
 

+namespace
+{
+
+// helper of DoInsertOrAppend(): returns the HBITMAP to use in MENUITEMINFO
+HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true)
+{
+    // Under versions of Windows older than Vista we can't pass HBITMAP
+    // directly as hbmpItem for 2 reasons:
+    //  1. We can't draw it with transparency then (this is not
+    //     very important now but would be with themed menu bg)
+    //  2. Worse, Windows inverts the bitmap for the selected
+    //     item and this looks downright ugly
+    //
+    // So we prefer to instead draw it ourselves in MSWOnDrawItem().by using
+    // HBMMENU_CALLBACK when inserting it
+    //
+    // However under Vista using HBMMENU_CALLBACK causes the entire menu to be
+    // drawn using the classic theme instead of the current one and it does
+    // handle transparency just fine so do use the real bitmap there
+#if wxUSE_IMAGE
+    if ( wxGetWinVersion() >= wxWinVersion_Vista )
+    {
+#if wxUSE_OWNER_DRAWN
+        wxBitmap bmp = pItem->GetBitmap(checked);
+        if ( bmp.IsOk() )
+        {
+            // we must use PARGB DIB for the menu bitmaps so ensure that we do
+            wxImage img(bmp.ConvertToImage());
+            if ( !img.HasAlpha() )
+            {
+                img.InitAlpha();
+                pItem->SetBitmap(img, checked);
+            }
+
+            return GetHbitmapOf(pItem->GetBitmap(checked));
+        }
+#endif // wxUSE_OWNER_DRAWN
+        //else: bitmap is not set
+
+        return NULL;
+    }
+#endif // wxUSE_IMAGE
+
+    return HBMMENU_CALLBACK;
+}
+
+} // anonymous namespace
+
+bool wxMenu::MSWGetRadioGroupRange(int pos, int *start, int *end) const
+{
+    return m_radioData && m_radioData->GetGroupRange(pos, start, end);
+}
+

 // append a new item or submenu to the menu
 bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 {
 // append a new item or submenu to the menu
 bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 {


@@ -354,7 +470,8 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     UpdateAccel(pItem);
 #endif // wxUSE_ACCEL
 
     UpdateAccel(pItem);
 #endif // wxUSE_ACCEL
 

-    UINT flags = 0;
+    // we should support disabling the item even prior to adding it to the menu
+    UINT flags = pItem->IsEnabled() ? MF_ENABLED : MF_GRAYED;

 
     // if "Break" has just been called, insert a menu break before this item
     // (and don't forget to reset the flag)
 
     // if "Break" has just been called, insert a menu break before this item
     // (and don't forget to reset the flag)


@@ -369,24 +486,24 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 
     // id is the numeric id for normal menu items and HMENU for submenus as
     // required by ::AppendMenu() API
 
     // id is the numeric id for normal menu items and HMENU for submenus as
     // required by ::AppendMenu() API

-    UINT id;
+    UINT_PTR id;

     wxMenu *submenu = pItem->GetSubMenu();
     if ( submenu != NULL ) {
         wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") );
 
         submenu->SetParent(this);
 
     wxMenu *submenu = pItem->GetSubMenu();
     if ( submenu != NULL ) {
         wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") );
 
         submenu->SetParent(this);
 

-        id = (UINT)submenu->GetHMenu();
+        id = (UINT_PTR)submenu->GetHMenu();

 
         flags |= MF_POPUP;
     }
     else {
 
         flags |= MF_POPUP;
     }
     else {

-        id = pItem->GetId();
+        id = pItem->GetMSWId();

     }
 
 
     // prepare to insert the item in the menu
     }
 
 
     // prepare to insert the item in the menu

-    wxString itemText = pItem->GetText();
+    wxString itemText = pItem->GetItemLabel();

     LPCTSTR pData = NULL;
     if ( pos == (size_t)-1 )
     {
     LPCTSTR pData = NULL;
     if ( pos == (size_t)-1 )
     {


@@ -395,41 +512,92 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         pos = GetMenuItemCount() - 1;
     }
 
         pos = GetMenuItemCount() - 1;
     }
 

-    // adjust position to account for the title, if any
-    if ( !m_title.empty() )
+    // Update radio groups data if we're inserting a new radio item.
+    //
+    // NB: If we supported inserting non-radio items in the middle of existing
+    //     radio groups to break them into two subgroups, we'd need to update
+    //     m_radioData in this case too but currently this is not supported.
+    bool checkInitially = false;
+    if ( pItem->GetKind() == wxITEM_RADIO )
+    {
+        if ( !m_radioData )
+            m_radioData = new wxMenuRadioItemsData;
+
+        if ( m_radioData->UpdateOnInsert(pos) )
+            checkInitially = true;
+    }
+
+    // adjust position to account for the title of a popup menu, if any
+    if ( !GetMenuBar() && !m_title.empty() )

         pos += 2; // for the title itself and its separator
 
     BOOL ok = false;
 
         pos += 2; // for the title itself and its separator
 
     BOOL ok = false;
 

+#if wxUSE_OWNER_DRAWN
+    // Under older systems mixing owner-drawn and non-owner-drawn items results
+    // in inconsistent margins, so we force this one to be owner-drawn if any
+    // other items already are.
+    if ( m_ownerDrawn )
+        pItem->SetOwnerDrawn(true);
+#endif // wxUSE_OWNER_DRAWN
+

     // check if we have something more than a simple text item
 #if wxUSE_OWNER_DRAWN
     if ( pItem->IsOwnerDrawn() )
     {
     // check if we have something more than a simple text item
 #if wxUSE_OWNER_DRAWN
     if ( pItem->IsOwnerDrawn() )
     {

-        // is the item owner-drawn just because of the bitmap?
-        if ( pItem->GetBitmap().Ok() &&
-                !pItem->GetTextColour().Ok() &&
-                    !pItem->GetBackgroundColour().Ok() &&
-                        !pItem->GetFont().Ok() &&
-                            !pItem->GetBitmap(true).Ok() )
+#ifndef __DMC__
+
+        if ( !m_ownerDrawn && !pItem->IsSeparator() )

         {
         {

-            // try to use InsertMenuItem() as it's guaranteed to look correct
-            // while our owner-drawn code is not
+            // MIIM_BITMAP only works under WinME/2000+ so we always use owner
+            // drawn item under the previous versions and we also have to use
+            // them in any case if the item has custom colours or font
+            static const wxWinVersion winver = wxGetWinVersion();
+            bool mustUseOwnerDrawn = winver < wxWinVersion_98 ||
+                                     pItem->GetTextColour().IsOk() ||
+                                     pItem->GetBackgroundColour().IsOk() ||
+                                     pItem->GetFont().IsOk();
+
+            if ( !mustUseOwnerDrawn )
+            {
+                const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
+                                bmpChecked   = pItem->GetBitmap(true);

 
 

-            // first compile-time check
-#ifdef MIIM_BITMAP
-            WinStruct<MENUITEMINFO> mii;
+                if ( (bmpUnchecked.IsOk() && IsGreaterThanStdSize(bmpUnchecked)) ||
+                     (bmpChecked.IsOk()   && IsGreaterThanStdSize(bmpChecked)) )
+                {
+                    mustUseOwnerDrawn = true;
+                }
+            }

 
 

-            // now run-time one: MIIM_BITMAP only works under WinME/2000+
-            if ( wxGetWinVersion() >= wxWinVersion_98 )
+            // use InsertMenuItem() if possible as it's guaranteed to look
+            // correct while our owner-drawn code is not
+            if ( !mustUseOwnerDrawn )

             {
             {

-                mii.fMask = MIIM_STRING | MIIM_DATA | MIIM_BITMAP;
+                WinStruct<MENUITEMINFO> mii;
+                mii.fMask = MIIM_STRING | MIIM_DATA;
+
+                // don't set hbmpItem for the checkable items as it would
+                // be used for both checked and unchecked state
+                if ( pItem->IsCheckable() )
+                {
+                    mii.fMask |= MIIM_CHECKMARKS;
+                    mii.hbmpChecked = GetHBitmapForMenu(pItem, true);
+                    mii.hbmpUnchecked = GetHBitmapForMenu(pItem, false);
+                }
+                else if ( pItem->GetBitmap().IsOk() )
+                {
+                    mii.fMask |= MIIM_BITMAP;
+                    mii.hbmpItem = GetHBitmapForMenu(pItem);
+                }
+

                 mii.cch = itemText.length();
                 mii.cch = itemText.length();

-                mii.dwTypeData = wx_const_cast(wxChar *, itemText.c_str());
+                mii.dwTypeData = const_cast<wxChar *>(itemText.wx_str());

 
 

-                if (flags & MF_POPUP)
+                if ( flags & MF_POPUP )

                 {
                     mii.fMask |= MIIM_SUBMENU;
                 {
                     mii.fMask |= MIIM_SUBMENU;

-                    mii.hSubMenu = (HMENU)pItem->GetSubMenu()->GetHMenu();
+                    mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu());

                 }
                 else
                 {
                 }
                 else
                 {


@@ -437,15 +605,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                     mii.wID = id;
                 }
 
                     mii.wID = id;
                 }
 

-                // we can't pass HBITMAP directly as hbmpItem for 2 reasons:
-                //  1. we can't draw it with transparency then (this is not
-                //     very important now but would be with themed menu bg)
-                //  2. worse, Windows inverts the bitmap for the selected
-                //     item and this looks downright ugly
-                //
-                // so instead draw it ourselves in MSWOnDrawItem()
-                mii.dwItemData = wx_reinterpret_cast(ULONG_PTR, pItem);
-                mii.hbmpItem = HBMMENU_CALLBACK;
+                mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);

 
                 ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
                 if ( !ok )
 
                 ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
                 if ( !ok )


@@ -464,29 +624,85 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                     // the app from starting up under Windows 95/NT 4
                     typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *);
 
                     // the app from starting up under Windows 95/NT 4
                     typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *);
 

-                    wxDynamicLibrary dllUser(_T("user32"));
+                    wxDynamicLibrary dllUser(wxT("user32"));

                     wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
                     if ( pfnSetMenuInfo )
                     {
                         mi.fMask = MIM_STYLE;
                         mi.dwStyle = MNS_CHECKORBMP;
                         if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
                     wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
                     if ( pfnSetMenuInfo )
                     {
                         mi.fMask = MIM_STYLE;
                         mi.dwStyle = MNS_CHECKORBMP;
                         if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )

-                            wxLogLastError(_T("SetMenuInfo(MNS_NOCHECK)"));
+                        {
+                            wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)"));
+                        }

                     }
 
                     // tell the item that it's not really owner-drawn but only
                     // needs to draw its bitmap, the rest is done by Windows
                     }
 
                     // tell the item that it's not really owner-drawn but only
                     // needs to draw its bitmap, the rest is done by Windows

-                    pItem->ResetOwnerDrawn();
+                    pItem->SetOwnerDrawn(false);

                 }
             }
                 }
             }

-#endif // MIIM_BITMAP

         }
         }

+#endif // __DMC__

 
         if ( !ok )
         {
             // item draws itself, pass pointer to it in data parameter
             flags |= MF_OWNERDRAW;
             pData = (LPCTSTR)pItem;
 
         if ( !ok )
         {
             // item draws itself, pass pointer to it in data parameter
             flags |= MF_OWNERDRAW;
             pData = (LPCTSTR)pItem;

+
+            bool updateAllMargins = false;
+
+            // get size of bitmap always return valid value (0 for invalid bitmap),
+            // so we don't needed check if bitmap is valid ;)
+            int uncheckedW = pItem->GetBitmap(false).GetWidth();
+            int checkedW   = pItem->GetBitmap(true).GetWidth();
+
+            if ( m_maxBitmapWidth < uncheckedW )
+            {
+                m_maxBitmapWidth = uncheckedW;
+                updateAllMargins = true;
+            }
+
+            if ( m_maxBitmapWidth < checkedW )
+            {
+                m_maxBitmapWidth = checkedW;
+                updateAllMargins = true;
+            }
+
+            // make other item ownerdrawn and update margin width for equals alignment
+            if ( !m_ownerDrawn || updateAllMargins )
+            {
+                // we must use position in SetOwnerDrawnMenuItem because
+                // all separators have the same id
+                int pos = 0;
+                wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+                while (node)
+                {
+                    wxMenuItem* item = node->GetData();
+
+                    if ( !item->IsOwnerDrawn())
+                    {
+                        item->SetOwnerDrawn(true);
+                        SetOwnerDrawnMenuItem(GetHmenu(), pos,
+                                              reinterpret_cast<ULONG_PTR>(item), TRUE);
+                    }
+
+                    item->SetMarginWidth(m_maxBitmapWidth);
+
+                    node = node->GetNext();
+                    pos++;
+                }
+
+                // set menu as ownerdrawn
+                m_ownerDrawn = true;
+
+                ResetMaxAccelWidth();
+            }
+            // only update our margin for equals alignment to other item
+            else if ( !updateAllMargins )
+            {
+                pItem->SetMarginWidth(m_maxBitmapWidth);
+            }

         }
     }
     else
         }
     }
     else


@@ -496,10 +712,10 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         flags |= MF_STRING;
 
 #ifdef __WXWINCE__
         flags |= MF_STRING;
 
 #ifdef __WXWINCE__

-        itemText = wxMenuItem::GetLabelFromText(itemText);
+        itemText = wxMenuItem::GetLabelText(itemText);

 #endif
 
 #endif
 

-        pData = (wxChar*)itemText.c_str();
+        pData = (wxChar*)itemText.wx_str();

     }
 
     // item might have already been inserted by InsertMenuItem() above
     }
 
     // item might have already been inserted by InsertMenuItem() above


@@ -514,8 +730,12 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     }
 
 
     }
 
 

+    // Check the item if it should be initially checked.
+    if ( checkInitially )
+        pItem->Check(true);
+

     // if we just appended the title, highlight it
     // if we just appended the title, highlight it

-    if ( (int)id == idMenuTitle )
+    if ( id == (UINT_PTR)idMenuTitle )

     {
         // visually select the menu title
         SetDefaultMenuItem(GetHmenu(), id);
     {
         // visually select the menu title
         SetDefaultMenuItem(GetHmenu(), id);


@@ -530,67 +750,9 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     return true;
 }
 
     return true;
 }
 

-void wxMenu::EndRadioGroup()
-{
-    // we're not inside a radio group any longer
-    m_startRadioGroup = -1;
-}
-

 wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 {
 wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 {

-    wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
-
-    bool check = false;
-
-    if ( item->GetKind() == wxITEM_RADIO )
-    {
-        int count = GetMenuItemCount();
-
-        if ( m_startRadioGroup == -1 )
-        {
-            // start a new radio group
-            m_startRadioGroup = count;
-
-            // for now it has just one element
-            item->SetAsRadioGroupStart();
-            item->SetRadioGroupEnd(m_startRadioGroup);
-
-            // ensure that we have a checked item in the radio group
-            check = true;
-        }
-        else // extend the current radio group
-        {
-            // we need to update its end item
-            item->SetRadioGroupStart(m_startRadioGroup);
-            wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
-
-            if ( node )
-            {
-                node->GetData()->SetRadioGroupEnd(count);
-            }
-            else
-            {
-                wxFAIL_MSG( _T("where is the radio group start item?") );
-            }
-        }
-    }
-    else // not a radio item
-    {
-        EndRadioGroup();
-    }
-
-    if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
-    {
-        return NULL;
-    }
-
-    if ( check )
-    {
-        // check the item initially
-        item->Check(true);
-    }
-
-    return item;
+    return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item) ? item : NULL;

 }
 
 wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 }
 
 wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)


@@ -625,6 +787,10 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
         delete m_accels[n];
 
         m_accels.RemoveAt(n);
         delete m_accels[n];
 
         m_accels.RemoveAt(n);

+
+#if wxUSE_OWNER_DRAWN
+        ResetMaxAccelWidth();
+#endif

     }
     //else: this item doesn't have an accel, nothing to do
 #endif // wxUSE_ACCEL
     }
     //else: this item doesn't have an accel, nothing to do
 #endif // wxUSE_ACCEL


@@ -664,8 +830,45 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const
     return count;
 }
 
     return count;
 }
 

+wxAcceleratorTable *wxMenu::CreateAccelTable() const
+{
+    const size_t count = m_accels.size();
+    wxScopedArray<wxAcceleratorEntry> accels(new wxAcceleratorEntry[count]);
+    CopyAccels(accels.get());
+
+    return new wxAcceleratorTable(count, accels.get());
+}
+

 #endif // wxUSE_ACCEL
 
 #endif // wxUSE_ACCEL
 

+// ---------------------------------------------------------------------------
+// ownerdrawn helpers
+// ---------------------------------------------------------------------------
+
+#if wxUSE_OWNER_DRAWN
+
+void wxMenu::CalculateMaxAccelWidth()
+{
+    wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") );
+
+    wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+    while (node)
+    {
+        wxMenuItem* item = node->GetData();
+
+        if ( item->IsOwnerDrawn() )
+        {
+            int width = item->MeasureAccelWidth();
+            if (width > m_maxAccelWidth )
+                m_maxAccelWidth = width;
+        }
+
+        node = node->GetNext();
+    }
+}
+
+#endif // wxUSE_OWNER_DRAWN
+

 // ---------------------------------------------------------------------------
 // set wxMenu title
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // set wxMenu title
 // ---------------------------------------------------------------------------


@@ -682,7 +885,7 @@ void wxMenu::SetTitle(const wxString& label)
         if ( !label.empty() )
         {
             if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
         if ( !label.empty() )
         {
             if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,

-                               (unsigned)idMenuTitle, m_title) ||
+                               (UINT_PTR)idMenuTitle, m_title.wx_str()) ||

                  !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
             {
                 wxLogLastError(wxT("InsertMenu"));
                  !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
             {
                 wxLogLastError(wxT("InsertMenu"));


@@ -704,13 +907,11 @@ void wxMenu::SetTitle(const wxString& label)
         {
             // modify the title
 #ifdef __WXWINCE__
         {
             // modify the title
 #ifdef __WXWINCE__

-            MENUITEMINFO info;
-            wxZeroMemory(info);
-            info.cbSize = sizeof(info);
+            WinStruct<MENUITEMINFO> info;

             info.fMask = MIIM_TYPE;
             info.fType = MFT_STRING;
             info.cch = m_title.length();
             info.fMask = MIIM_TYPE;
             info.fType = MFT_STRING;
             info.cch = m_title.length();

-            info.dwTypeData = (LPTSTR) m_title.c_str();
+            info.dwTypeData = const_cast<wxChar *>(m_title.wx_str());

             if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
             {
                 wxLogLastError(wxT("SetMenuItemInfo"));
             if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
             {
                 wxLogLastError(wxT("SetMenuItemInfo"));


@@ -718,7 +919,7 @@ void wxMenu::SetTitle(const wxString& label)
 #else
             if ( !ModifyMenu(hMenu, 0u,
                              MF_BYPOSITION | MF_STRING,
 #else
             if ( !ModifyMenu(hMenu, 0u,
                              MF_BYPOSITION | MF_STRING,

-                             (unsigned)idMenuTitle, m_title) )
+                             (UINT_PTR)idMenuTitle, m_title.wx_str()) )

             {
                 wxLogLastError(wxT("ModifyMenu"));
             }
             {
                 wxLogLastError(wxT("ModifyMenu"));
             }


@@ -739,33 +940,62 @@ void wxMenu::SetTitle(const wxString& label)
 // event processing
 // ---------------------------------------------------------------------------
 
 // event processing
 // ---------------------------------------------------------------------------
 

-bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
+bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)

 {
 {

+    const int id = (signed short)id_;
+

     // ignore commands from the menu title
     // ignore commands from the menu title

-    if ( id != (WXWORD)idMenuTitle )
+    if ( id != idMenuTitle )

     {
     {

-        // get the checked status of the command: notice that menuState is the
-        // old state of the menu, so the test for MF_CHECKED must be inverted
-        UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND);
-        SendEvent(id, !(menuState & MF_CHECKED));
+        // Default value for uncheckable items.
+        int checked = -1;
+
+        // update the check item when it's clicked
+        wxMenuItem * const item = FindItem(id);
+        if ( item && item->IsCheckable() )
+        {
+            item->Toggle();
+
+            // Get the status of the menu item: note that it has been just changed
+            // by Toggle() above so here we already get the new state of the item.
+            //
+            // Also notice that we must pass unsigned id_ and not sign-extended id
+            // to ::GetMenuState() as this is what it expects.
+            UINT menuState = ::GetMenuState(GetHmenu(), id_, MF_BYCOMMAND);
+            checked = (menuState & MF_CHECKED) != 0;
+        }
+
+        SendEvent(id, checked);

     }
 
     return true;
 }
 
     }
 
     return true;
 }
 

-// ---------------------------------------------------------------------------
-// other
-// ---------------------------------------------------------------------------
-
-wxWindow *wxMenu::GetWindow() const
+// get the menu with given handle (recursively)
+#if wxUSE_OWNER_DRAWN
+wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu)

 {
 {

-    if ( m_invokingWindow != NULL )
-        return m_invokingWindow;
-    else if ( GetMenuBar() != NULL)
-        return GetMenuBar()->GetFrame();
+    // check self
+    if ( GetHMenu() == hMenu )
+        return this;
+
+    // recursively query submenus
+    for ( size_t n = 0 ; n < GetMenuItemCount(); ++n )
+    {
+        wxMenuItem* item = FindItemByPosition(n);
+        wxMenu* submenu = item->GetSubMenu();
+        if ( submenu )
+        {
+            submenu = submenu->MSWGetMenu(hMenu);
+            if (submenu)
+                return submenu;
+        }
+    }

 
 

+    // unknown hMenu

     return NULL;
 }
     return NULL;
 }

+#endif // wxUSE_OWNER_DRAWN

 
 // ---------------------------------------------------------------------------
 // Menu Bar
 
 // ---------------------------------------------------------------------------
 // Menu Bar


@@ -801,12 +1031,13 @@ wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], lon
 {
     Init();
 
 {
     Init();
 

-    m_titles.Alloc(count);
-

     for ( size_t i = 0; i < count; i++ )
     {
     for ( size_t i = 0; i < count; i++ )
     {

+        // We just want to store the menu title in the menu itself, not to
+        // show it as a dummy item in the menu itself as we do with the popup
+        // menu titles in overridden wxMenu::SetTitle().
+        menus[i]->wxMenuBase::SetTitle(titles[i]);

         m_menus.Append(menus[i]);
         m_menus.Append(menus[i]);

-        m_titles.Add(titles[i]);

 
         menus[i]->Attach(this);
     }
 
         menus[i]->Attach(this);
     }


@@ -873,41 +1104,41 @@ WXHMENU wxMenuBar::Create()
     if ( m_hMenu != 0 )
         return m_hMenu;
 
     if ( m_hMenu != 0 )
         return m_hMenu;
 

-    if (!GetToolBar())
-        return 0;
+    wxToolMenuBar * const bar = static_cast<wxToolMenuBar *>(GetToolBar());
+    if ( !bar )
+        return NULL;

 
 

-    HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
-    HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0);
+    HWND hCommandBar = GetHwndOf(bar);

 
 

-    // hMenu may be zero on Windows Mobile 5. So add the menus anyway.
-    if (1) // (hMenu)
-    {
-        TBBUTTON tbButton;
-        memset(&tbButton, 0, sizeof(TBBUTTON));
-        tbButton.iBitmap = I_IMAGENONE;
-        tbButton.fsState = TBSTATE_ENABLED;
-        tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
+    // notify comctl32.dll about the version of the headers we use before using
+    // any other TB_XXX messages
+    SendMessage(hCommandBar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);

 
 

-        size_t i;
-        for (i = 0; i < GetMenuCount(); i++)
-        {
-            HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu() ;
-            tbButton.dwData = (DWORD)hPopupMenu;
-            wxString label = wxStripMenuCodes(GetLabelTop(i));
-            tbButton.iString = (int) label.c_str();
+    TBBUTTON tbButton;
+    wxZeroMemory(tbButton);
+    tbButton.iBitmap = I_IMAGENONE;
+    tbButton.fsState = TBSTATE_ENABLED;
+    tbButton.fsStyle = TBSTYLE_DROPDOWN |
+                       TBSTYLE_NO_DROPDOWN_ARROW |
+                       TBSTYLE_AUTOSIZE;

 
 

-            int position = i;
+    for ( unsigned i = 0; i < GetMenuCount(); i++ )
+    {
+        HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu();
+        tbButton.dwData = (DWORD)hPopupMenu;
+        wxString label = wxStripMenuCodes(GetMenuLabel(i));
+        tbButton.iString = (int) label.wx_str();

 
 

-            tbButton.idCommand = NewControlId();
-            if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton))
-            {
-                wxLogLastError(wxT("TB_INSERTBUTTON"));
-            }
+        tbButton.idCommand = NewControlId();
+        if ( !::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton) )
+        {
+            wxLogLastError(wxT("TB_INSERTBUTTON"));

         }
     }
         }
     }

-    m_hMenu = (WXHMENU) hMenu;
+
+    m_hMenu = bar->GetHMenu();

     return m_hMenu;
     return m_hMenu;

-#else
+#else // !__WXWINCE__

     if ( m_hMenu != 0 )
         return m_hMenu;
 
     if ( m_hMenu != 0 )
         return m_hMenu;
 


@@ -919,13 +1150,13 @@ WXHMENU wxMenuBar::Create()
     }
     else
     {
     }
     else
     {

-        size_t count = GetMenuCount(), i;
-        wxMenuList::iterator it;
-        for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
+        for ( wxMenuList::iterator it = m_menus.begin();
+              it != m_menus.end();
+              ++it )

         {
             if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
         {
             if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,

-                               (UINT)(*it)->GetHMenu(),
-                               m_titles[i]) )
+                               (UINT_PTR)(*it)->GetHMenu(),
+                               (*it)->GetTitle().wx_str()) )

             {
                 wxLogLastError(wxT("AppendMenu"));
             }
             {
                 wxLogLastError(wxT("AppendMenu"));
             }


@@ -933,7 +1164,7 @@ WXHMENU wxMenuBar::Create()
     }
 
     return m_hMenu;
     }
 
     return m_hMenu;

-#endif
+#endif // __WXWINCE__/!__WXWINCE__

 }
 
 int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
 }
 
 int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)


@@ -982,11 +1213,24 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
     Refresh();
 }
 
     Refresh();
 }
 

-void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
+bool wxMenuBar::IsEnabledTop(size_t pos) const
+{
+    wxCHECK_MSG( pos < GetMenuCount(), false, wxS("invalid menu index") );
+    WinStruct<MENUITEMINFO> mii;
+    mii.fMask = MIIM_STATE;
+    if ( !::GetMenuItemInfo(GetHmenu(), pos, TRUE, &mii) )
+    {
+        wxLogLastError(wxS("GetMenuItemInfo(menubar)"));
+    }
+
+    return !(mii.fState & MFS_GRAYED);
+}
+
+void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)

 {
     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
 
 {
     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
 

-    m_titles[pos] = label;
+    m_menus[pos]->wxMenuBase::SetTitle(label);

 
     if ( !IsAttached() )
     {
 
     if ( !IsAttached() )
     {


@@ -996,7 +1240,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
 
     int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
 
 
     int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
 

-    UINT id;
+    UINT_PTR id;

     UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
     if ( flagsOld == 0xFFFFFFFF )
     {
     UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
     if ( flagsOld == 0xFFFFFFFF )
     {


@@ -1009,7 +1253,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     {
         // HIBYTE contains the number of items in the submenu in this case
         flagsOld &= 0xff;
     {
         // HIBYTE contains the number of items in the submenu in this case
         flagsOld &= 0xff;

-        id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos);
+        id = (UINT_PTR)::GetSubMenu((HMENU)m_hMenu, mswpos);

     }
     else
     {
     }
     else
     {


@@ -1017,21 +1261,19 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     }
 
 #ifdef __WXWINCE__
     }
 
 #ifdef __WXWINCE__

-    MENUITEMINFO info;
-    wxZeroMemory(info);
-    info.cbSize = sizeof(info);
+    WinStruct<MENUITEMINFO> info;

     info.fMask = MIIM_TYPE;
     info.fType = MFT_STRING;
     info.cch = label.length();
     info.fMask = MIIM_TYPE;
     info.fType = MFT_STRING;
     info.cch = label.length();

-    info.dwTypeData = (LPTSTR) label.c_str();
-    if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, & info) )
+    info.dwTypeData = const_cast<wxChar *>(label.wx_str());
+    if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, &info) )

     {
         wxLogLastError(wxT("SetMenuItemInfo"));
     }
 
 #else
     if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
     {
         wxLogLastError(wxT("SetMenuItemInfo"));
     }
 
 #else
     if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,

-        id, label) == (int)0xFFFFFFFF )
+                      id, label.wx_str()) == (int)0xFFFFFFFF )

     {
         wxLogLastError(wxT("ModifyMenu"));
     }
     {
         wxLogLastError(wxT("ModifyMenu"));
     }


@@ -1040,12 +1282,12 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     Refresh();
 }
 
     Refresh();
 }
 

-wxString wxMenuBar::GetLabelTop(size_t pos) const
+wxString wxMenuBar::GetMenuLabel(size_t pos) const

 {
     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
 {
     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,

-                 wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+                 wxT("invalid menu index in wxMenuBar::GetMenuLabel") );

 
 

-    return wxMenuItem::GetLabelFromText(m_titles[pos]);
+    return m_menus[pos]->GetTitle();

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1058,7 +1300,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
     if ( !menuOld )
         return NULL;
 
     if ( !menuOld )
         return NULL;
 

-    m_titles[pos] = title;
+    menu->wxMenuBase::SetTitle(title);

 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     if (IsAttached())
 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     if (IsAttached())


@@ -1076,7 +1318,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 
         if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
 
         if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,

-                           (UINT)GetHmenuOf(menu), title) )
+                           (UINT_PTR)GetHmenuOf(menu), title.wx_str()) )

         {
             wxLogLastError(wxT("InsertMenu"));
         }
         {
             wxLogLastError(wxT("InsertMenu"));
         }


@@ -1115,7 +1357,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return false;
 
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return false;
 

-    m_titles.Insert(title, pos);
+    menu->wxMenuBase::SetTitle(title);

 
     if ( isAttached )
     {
 
     if ( isAttached )
     {


@@ -1131,7 +1373,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(title);
         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(title);

-        tbButton.iString = (int) label.c_str();
+        tbButton.iString = (int) label.wx_str();

 
         tbButton.idCommand = NewControlId();
         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
 
         tbButton.idCommand = NewControlId();
         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))


@@ -1143,7 +1385,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 #else
         if ( !::InsertMenu(GetHmenu(), mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
 #else
         if ( !::InsertMenu(GetHmenu(), mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,

-                           (UINT)GetHmenuOf(menu), title) )
+                           (UINT_PTR)GetHmenuOf(menu), title.wx_str()) )

         {
             wxLogLastError(wxT("InsertMenu"));
         }
         {
             wxLogLastError(wxT("InsertMenu"));
         }


@@ -1171,7 +1413,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Append(menu, title) )
         return false;
 
     if ( !wxMenuBarBase::Append(menu, title) )
         return false;
 

-    m_titles.Add(title);
+    menu->wxMenuBase::SetTitle(title);

 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     if (IsAttached())
 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     if (IsAttached())


@@ -1192,7 +1434,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(title);
         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(title);

-        tbButton.iString = (int) label.c_str();
+        tbButton.iString = (int) label.wx_str();

 
         tbButton.idCommand = NewControlId();
         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
 
         tbButton.idCommand = NewControlId();
         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))


@@ -1202,7 +1444,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
         }
 #else
         if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
         }
 #else
         if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,

-                           (UINT)submenu, title) )
+                           (UINT_PTR)submenu, title.wx_str()) )

         {
             wxLogLastError(wxT("AppendMenu"));
         }
         {
             wxLogLastError(wxT("AppendMenu"));
         }


@@ -1262,8 +1504,6 @@ wxMenu *wxMenuBar::Remove(size_t pos)
             Refresh();
     }
 
             Refresh();
     }
 

-    m_titles.RemoveAt(pos);
-

     return menu;
 }
 
     return menu;
 }
 


@@ -1290,7 +1530,7 @@ void wxMenuBar::RebuildAccelTable()
             nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
         }
 
             nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
         }
 

-        m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
+        SetAcceleratorTable(wxAcceleratorTable(nAccelCount, accelEntries));

 
         delete [] accelEntries;
     }
 
         delete [] accelEntries;
     }


@@ -1333,9 +1573,13 @@ bool wxMenuBar::AddAdornments(long style)
     if (style & wxCLOSE_BOX)
     {
         if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0))
     if (style & wxCLOSE_BOX)
     {
         if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0))

+        {

             wxLogLastError(wxT("CommandBar_AddAdornments"));
             wxLogLastError(wxT("CommandBar_AddAdornments"));

+        }

         else
         else

+        {

             return true;
             return true;

+        }

     }
     return false;
 }
     }
     return false;
 }


@@ -1346,4 +1590,24 @@ void wxMenuBar::Detach()
     wxMenuBarBase::Detach();
 }
 
     wxMenuBarBase::Detach();
 }
 

+// get the menu with given handle (recursively)
+wxMenu* wxMenuBar::MSWGetMenu(WXHMENU hMenu)
+{
+    wxCHECK_MSG( GetHMenu() != hMenu, NULL,
+                 wxT("wxMenuBar::MSWGetMenu(): menu handle is wxMenuBar, not wxMenu") );
+
+#if wxUSE_OWNER_DRAWN
+    // query all menus
+    for ( size_t n = 0 ; n < GetMenuCount(); ++n )
+    {
+        wxMenu* menu = GetMenu(n)->MSWGetMenu(hMenu);
+        if ( menu )
+            return menu;
+    }
+#endif
+
+    // unknown hMenu
+    return NULL;
+}
+

 #endif // wxUSE_MENUS
 #endif // wxUSE_MENUS