really show the window after creation (calling Show(TRUE) doesn't do it any more)

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

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 0894f1f6cf9db8670b6118520dc034de1934d1de..151427eca6fc2e434c3e028529ad993ed81e35ec 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -5,8 +5,8 @@
 // Modified by: Vadim Zeitlin
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by: Vadim Zeitlin
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "menu.h"
 #endif
 
     #pragma implementation "menu.h"
 #endif
 


@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MENUS
+

 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/menu.h"
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/menu.h"


@@ -42,6 +44,21 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+#ifdef __WXWINCE__
+#include <windows.h>
+#include <windowsx.h>
+#include <tchar.h>
+#include <ole2.h>
+#include <shellapi.h>
+#include <commctrl.h>
+#if _WIN32_WCE < 400
+#include <aygshell.h>
+#endif
+
+#include "wx/msw/wince/missing.h"
+
+#endif
+

 // other standard headers
 #include <string.h>
 
 // other standard headers
 #include <string.h>
 


@@ -56,19 +73,140 @@ extern wxMenu *wxCurrentPopupMenu;
 // ----------------------------------------------------------------------------
 
 // the (popup) menu title has this special id
 // ----------------------------------------------------------------------------
 
 // the (popup) menu title has this special id

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

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

-// macros
+// private functions

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

-    IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
+// make the given menu item default
+static void SetDefaultMenuItem(HMENU hmenu, UINT 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)
+{
+    MENUITEMINFO info;
+    wxZeroMemory(info);
+    info.cbSize = sizeof(info);
+    info.fMask = MIIM_STATE;
+    if ( !GetMenuItemInfo(hMenu, id, flags & MF_BYCOMMAND ? FALSE : TRUE, & info) )
+        wxLogLastError(wxT("GetMenuItemInfo"));
+    return info.fState;
+}
+#endif

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 

+#include <wx/listimpl.cpp>
+
+WX_DEFINE_LIST( wxMenuInfoList ) ;
+
+#if wxUSE_EXTENDED_RTTI
+
+WX_DEFINE_FLAGS( wxMenuStyle )
+
+wxBEGIN_FLAGS( wxMenuStyle )
+    wxFLAGS_MEMBER(wxMENU_TEAROFF)
+wxEND_FLAGS( wxMenuStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler,"wx/menu.h")
+
+wxCOLLECTION_TYPE_INFO( wxMenuItem * , wxMenuItemList ) ;
+
+template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVariantArray &value)
+{
+    wxListCollectionToVariantArray<wxMenuItemList::compatibility_iterator>( theList , value ) ;
+}
+
+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 , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxMenu)
+wxEND_HANDLERS_TABLE()
+
+wxDIRECT_CONSTRUCTOR_2( wxMenu , wxString , Title , long , MenuStyle  )
+
+WX_DEFINE_FLAGS( wxMenuBarStyle )
+
+wxBEGIN_FLAGS( wxMenuBarStyle )
+    wxFLAGS_MEMBER(wxMB_DOCKABLE)
+wxEND_FLAGS( wxMenuBarStyle )
+
+// the negative id would lead the window (its superclass !) to vetoe streaming out otherwise
+bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxWriter * , wxPersister * , wxxVariantArray & )
+{
+    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 , , 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)
+{
+    wxListCollectionToVariantArray<wxMenuInfoList::compatibility_iterator>( theList , value ) ;
+}
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
+    wxPROPERTY_COLLECTION( MenuInfos , wxMenuInfoList , wxMenuInfo* , Append , GetMenuInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxMenuBar)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_DUMMY( wxMenuBar )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject)
+#endif
+
+const wxMenuInfoList& wxMenuBar::GetMenuInfos() const
+{
+    wxMenuInfoList* list = const_cast< wxMenuInfoList* >( &m_menuInfos ) ;
+    WX_CLEAR_LIST( wxMenuInfoList , *list ) ;
+    for( size_t i = 0 ; i < GetMenuCount() ; ++i )
+    {
+        wxMenuInfo* info = new wxMenuInfo() ;
+        info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetLabelTop(i) ) ;
+        list->Append( info ) ;
+    }
+    return m_menuInfos ;
+}
+

 // ---------------------------------------------------------------------------
 // wxMenu construction, adding and removing menu items
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxMenu construction, adding and removing menu items
 // ---------------------------------------------------------------------------


@@ -77,12 +215,13 @@ static const int idMenuTitle = -2;
 void wxMenu::Init()
 {
     m_doBreak = FALSE;
 void wxMenu::Init()
 {
     m_doBreak = FALSE;

+    m_startRadioGroup = -1;

 
     // create the menu
     m_hMenu = (WXHMENU)CreatePopupMenu();
     if ( !m_hMenu )
     {
 
     // create the menu
     m_hMenu = (WXHMENU)CreatePopupMenu();
     if ( !m_hMenu )
     {

-        wxLogLastError("CreatePopupMenu");
+        wxLogLastError(wxT("CreatePopupMenu"));

     }
 
     // if we have a title, insert it in the beginning of the menu
     }
 
     // if we have a title, insert it in the beginning of the menu


@@ -103,7 +242,7 @@ wxMenu::~wxMenu()
     {
         if ( !::DestroyMenu(GetHmenu()) )
         {
     {
         if ( !::DestroyMenu(GetHmenu()) )
         {

-            wxLogLastError("DestroyMenu");
+            wxLogLastError(wxT("DestroyMenu"));

         }
     }
 
         }
     }
 


@@ -119,6 +258,13 @@ 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


@@ -135,35 +281,50 @@ int wxMenu::FindAccel(int id) const
 
 void wxMenu::UpdateAccel(wxMenuItem *item)
 {
 
 void wxMenu::UpdateAccel(wxMenuItem *item)
 {

-    // find the (new) accel for this item
-    wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText());
-    if ( accel )
-        accel->m_command = item->GetId();
-
-    // find the old one
-    int n = FindAccel(item->GetId());
-    if ( n == wxNOT_FOUND )
+    if ( item->IsSubMenu() )

     {
     {

-        // no old, add new if any
-        if ( accel )
-            m_accels.Add(accel);
-        else
-            return;     // skipping RebuildAccelTable() below
+        wxMenu *submenu = item->GetSubMenu();
+        wxMenuItemList::compatibility_iterator node = submenu->GetMenuItems().GetFirst();
+        while ( node )
+        {
+            UpdateAccel(node->GetData());
+
+            node = node->GetNext();
+        }

     }
     }

-    else
+    else if ( !item->IsSeparator() )

     {
     {

-        // replace old with new or just remove the old one if no new
-        delete m_accels[n];
+        // find the (new) accel for this item
+        wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText());

         if ( accel )
         if ( accel )

-            m_accels[n] = accel;
+            accel->m_command = item->GetId();
+
+        // find the old one
+        int n = FindAccel(item->GetId());
+        if ( n == wxNOT_FOUND )
+        {
+            // no old, add new if any
+            if ( accel )
+                m_accels.Add(accel);
+            else
+                return;     // skipping RebuildAccelTable() below
+        }

         else
         else

-            m_accels.Remove(n);
-    }
+        {
+            // replace old with new or just remove the old one if no new
+            delete m_accels[n];
+            if ( accel )
+                m_accels[n] = accel;
+            else
+                m_accels.RemoveAt(n);
+        }

 
 

-    if ( IsAttached() )
-    {
-        m_menuBar->RebuildAccelTable();
+        if ( IsAttached() )
+        {
+            GetMenuBar()->RebuildAccelTable();
+        }

     }
     }

+    //else: it is a separator, they can't have accels, nothing to do

 }
 
 #endif // wxUSE_ACCEL
 }
 
 #endif // wxUSE_ACCEL


@@ -205,6 +366,10 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         id = pItem->GetId();
     }
 
         id = pItem->GetId();
     }
 

+#ifdef __WXWINCE__
+    wxString strippedString;
+#endif
+

     LPCTSTR pData;
 
 #if wxUSE_OWNER_DRAWN
     LPCTSTR pData;
 
 #if wxUSE_OWNER_DRAWN


@@ -219,7 +384,12 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         // menu is just a normal string (passed in data parameter)
         flags |= MF_STRING;
 
         // menu is just a normal string (passed in data parameter)
         flags |= MF_STRING;
 

+#ifdef __WXWINCE__
+        strippedString = wxStripMenuCodes(pItem->GetText());
+        pData = (wxChar*)strippedString.c_str();
+#else

         pData = (wxChar*)pItem->GetText().c_str();
         pData = (wxChar*)pItem->GetText().c_str();

+#endif

     }
 
     BOOL ok;
     }
 
     BOOL ok;


@@ -234,54 +404,105 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 
     if ( !ok )
     {
 
     if ( !ok )
     {

-        wxLogLastError("Insert or AppendMenu");
+        wxLogLastError(wxT("Insert or AppendMenu"));

 
         return FALSE;
     }
 
         return FALSE;
     }

-    else
-    {
-        // if we just appended the title, highlight it
+
+    // if we just appended the title, highlight it

 #ifdef __WIN32__
 #ifdef __WIN32__

-        if ( (int)id == idMenuTitle )
+    if ( (int)id == idMenuTitle )
+    {
+        // visually select the menu title
+        SetDefaultMenuItem(GetHmenu(), id);
+    }
+#endif // __WIN32__
+
+    // if we're already attached to the menubar, we must update it
+    if ( IsAttached() && GetMenuBar()->IsAttached() )
+    {
+        GetMenuBar()->Refresh();
+    }
+
+    return TRUE;
+}
+
+void wxMenu::EndRadioGroup()
+{
+    // we're not inside a radio group any longer
+    m_startRadioGroup = -1;
+}
+
+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 )

         {
         {

-            // visually select the menu title
-            MENUITEMINFO mii;
-            mii.cbSize = sizeof(mii);
-            mii.fMask = MIIM_STATE;
-            mii.fState = MFS_DEFAULT;
+            // start a new radio group
+            m_startRadioGroup = count;
+
+            // for now it has just one element
+            item->SetAsRadioGroupStart();
+            item->SetRadioGroupEnd(m_startRadioGroup);

 
 

-            if ( !SetMenuItemInfo(GetHmenu(), (unsigned)id, FALSE, &mii) )
+            // 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 )

             {
             {

-                wxLogLastError(wxT("SetMenuItemInfo"));
+                node->GetData()->SetRadioGroupEnd(count);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("where is the radio group start item?") );

             }
         }
             }
         }

-#endif // __WIN32__
+    }
+    else // not a radio item
+    {
+        EndRadioGroup();
+    }

 
 

-        // if we're already attached to the menubar, we must update it
-        if ( IsAttached() )
-        {
-            m_menuBar->Refresh();
-        }
+    if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
+    {
+        return NULL;
+    }

 
 

-        return TRUE;
+    if ( check )
+    {
+        // check the item initially
+        item->Check(TRUE);

     }
     }

-}

 
 

-bool wxMenu::DoAppend(wxMenuItem *item)
-{
-    return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item);
+    return item;

 }
 
 }
 

-bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)

 {
 {

-    return wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos);
+    if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos))
+        return item;
+    else
+        return NULL;

 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
     // we need to find the items position in the child list
     size_t pos;
 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
     // we need to find the items position in the child list
     size_t pos;

-    wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();

     for ( pos = 0; node; pos++ )
     {
         if ( node->GetData() == item )
     for ( pos = 0; node; pos++ )
     {
         if ( node->GetData() == item )


@@ -300,7 +521,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
     {
         delete m_accels[n];
 
     {
         delete m_accels[n];
 

-        m_accels.Remove(n);
+        m_accels.RemoveAt(n);

     }
     //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


@@ -308,13 +529,13 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
     // remove the item from the menu
     if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
     {
     // remove the item from the menu
     if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
     {

-        wxLogLastError("RemoveMenu");
+        wxLogLastError(wxT("RemoveMenu"));

     }
 
     }
 

-    if ( IsAttached() )
+    if ( IsAttached() && GetMenuBar()->IsAttached() )

     {
         // otherwise, the chane won't be visible
     {
         // otherwise, the chane won't be visible

-        m_menuBar->Refresh();
+        GetMenuBar()->Refresh();

     }
 
     // and from internal data structures
     }
 
     // and from internal data structures


@@ -361,7 +582,7 @@ void wxMenu::SetTitle(const wxString& label)
                                (unsigned)idMenuTitle, m_title) ||
                  !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
             {
                                (unsigned)idMenuTitle, m_title) ||
                  !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
             {

-                wxLogLastError("InsertMenu");
+                wxLogLastError(wxT("InsertMenu"));

             }
         }
     }
             }
         }
     }


@@ -373,18 +594,32 @@ void wxMenu::SetTitle(const wxString& label)
             if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
                  !RemoveMenu(hMenu, 0, MF_BYPOSITION) )
             {
             if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
                  !RemoveMenu(hMenu, 0, MF_BYPOSITION) )
             {

-                wxLogLastError("RemoveMenu");
+                wxLogLastError(wxT("RemoveMenu"));

             }
         }
         else
         {
             // modify the title
             }
         }
         else
         {
             // modify the title

+#ifdef __WXWINCE__
+            MENUITEMINFO info;
+            wxZeroMemory(info);
+            info.cbSize = sizeof(info);
+            info.fMask = MIIM_TYPE;
+            info.fType = MFT_STRING;
+            info.cch = m_title.Length();
+            info.dwTypeData = (LPTSTR) m_title.c_str();
+            if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
+            {
+                wxLogLastError(wxT("SetMenuItemInfo"));
+            }
+#else

             if ( !ModifyMenu(hMenu, 0u,
                              MF_BYPOSITION | MF_STRING,
                              (unsigned)idMenuTitle, m_title) )
             {
             if ( !ModifyMenu(hMenu, 0u,
                              MF_BYPOSITION | MF_STRING,
                              (unsigned)idMenuTitle, m_title) )
             {

-                wxLogLastError("ModifyMenu");
+                wxLogLastError(wxT("ModifyMenu"));

             }
             }

+#endif

         }
     }
 
         }
     }
 


@@ -392,15 +627,7 @@ void wxMenu::SetTitle(const wxString& label)
     // put the title string in bold face
     if ( !m_title.IsEmpty() )
     {
     // put the title string in bold face
     if ( !m_title.IsEmpty() )
     {

-        MENUITEMINFO mii;
-        mii.cbSize = sizeof(mii);
-        mii.fMask = MIIM_STATE;
-        mii.fState = MFS_DEFAULT;
-
-        if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) )
-        {
-            wxLogLastError("SetMenuItemInfo");
-        }
+        SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle);

     }
 #endif // Win32
 }
     }
 #endif // Win32
 }


@@ -416,70 +643,27 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
     // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!!
     if ( id != (WXWORD)idMenuTitle )
     {
     // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!!
     if ( id != (WXWORD)idMenuTitle )
     {

-        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
-        event.SetEventObject( this );
-        event.SetId( id );
-        event.SetInt( id );
-        ProcessCommand(event);
+        // VZ: previosuly, the command int was set to id too which was quite
+        //     useless anyhow (as it could be retrieved using GetId()) and
+        //     uncompatible with wxGTK, so now we use the command int instead
+        //     to pass the checked status
+        UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND) ;
+        SendEvent(id, menuState & MF_CHECKED);

     }
 
     return TRUE;
 }
 
     }
 
     return TRUE;
 }
 

-bool wxMenu::ProcessCommand(wxCommandEvent & event)
-{
-    bool processed = FALSE;
-
-#if wxUSE_MENU_CALLBACK
-    // Try a callback
-    if (m_callback)
-    {
-        (void)(*(m_callback))(*this, event);
-        processed = TRUE;
-    }
-#endif // wxUSE_MENU_CALLBACK
-
-    // Try the menu's event handler
-    if ( !processed && GetEventHandler())
-    {
-        processed = GetEventHandler()->ProcessEvent(event);
-    }
-
-    // Try the window the menu was popped up from (and up through the
-    // hierarchy)
-    wxWindow *win = GetInvokingWindow();
-    if ( !processed && win )
-        processed = win->GetEventHandler()->ProcessEvent(event);
-
-    return processed;
-}
-

 // ---------------------------------------------------------------------------
 // other
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // other
 // ---------------------------------------------------------------------------
 

-void wxMenu::Attach(wxMenuBar *menubar)
-{
-    // menu can be in at most one menubar because otherwise they would both
-    // delete the menu pointer
-    wxASSERT_MSG( !m_menuBar, wxT("menu belongs to 2 menubars, expect a crash") );
-
-    m_menuBar = menubar;
-}
-
-void wxMenu::Detach()
-{
-    wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") );
-
-    m_menuBar = NULL;
-}
-

 wxWindow *wxMenu::GetWindow() const
 {
     if ( m_invokingWindow != NULL )
         return m_invokingWindow;
 wxWindow *wxMenu::GetWindow() const
 {
     if ( m_invokingWindow != NULL )
         return m_invokingWindow;

-    else if ( m_menuBar != NULL)
-        return m_menuBar->GetFrame();
+    else if ( GetMenuBar() != NULL)
+        return GetMenuBar()->GetFrame();

 
     return NULL;
 }
 
     return NULL;
 }


@@ -491,8 +675,16 @@ wxWindow *wxMenu::GetWindow() const
 void wxMenuBar::Init()
 {
     m_eventHandler = this;
 void wxMenuBar::Init()
 {
     m_eventHandler = this;

-    m_menuBarFrame = NULL;

     m_hMenu = 0;
     m_hMenu = 0;

+#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI)
+    m_toolBar = NULL;
+#endif
+    // Not using a combined wxToolBar/wxMenuBar? then use
+    // a commandbar in WinCE .NET just to implement the
+    // menubar.
+#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI)
+    m_commandBar = NULL;
+#endif

 }
 
 wxMenuBar::wxMenuBar()
 }
 
 wxMenuBar::wxMenuBar()


@@ -522,6 +714,25 @@ wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
 
 wxMenuBar::~wxMenuBar()
 {
 
 wxMenuBar::~wxMenuBar()
 {

+    // In Windows CE (not .NET), the menubar is always associated
+    // with a toolbar, which destroys the menu implicitly.
+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI)
+    if (GetToolBar())
+        GetToolBar()->SetMenuBar(NULL);
+#else
+    // we should free Windows resources only if Windows doesn't do it for us
+    // which happens if we're attached to a frame
+    if (m_hMenu && !IsAttached())
+    {
+#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI)
+        ::DestroyWindow((HWND) m_commandBar);
+        m_commandBar = (WXHWND) NULL;
+#else
+        ::DestroyMenu((HMENU)m_hMenu);
+#endif        
+        m_hMenu = (WXHMENU)NULL;
+    }
+#endif

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


@@ -532,37 +743,115 @@ void wxMenuBar::Refresh()
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
 
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
 

-    DrawMenuBar(GetHwndOf(m_menuBarFrame));
+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI)
+    if (GetToolBar())
+    {
+        CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0);
+    }
+#elif defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI)
+    if (m_commandBar)
+        DrawMenuBar((HWND) m_commandBar);
+#else
+    DrawMenuBar(GetHwndOf(GetFrame()));
+#endif

 }
 
 WXHMENU wxMenuBar::Create()
 {
 }
 
 WXHMENU wxMenuBar::Create()
 {

-    if (m_hMenu != 0 )
+    // Note: this totally doesn't work on Smartphone,
+    // since you have to use resources.
+    // We'll have to find another way to add a menu
+    // by changing/adding menu items to an existing menu.
+#if defined(__WXWINCE__) && _WIN32_WCE < 400
+    if ( m_hMenu != 0 )

         return m_hMenu;
 
         return m_hMenu;
 

-    wxCHECK_MSG( !m_hMenu, TRUE, wxT("menubar already created") );
+    if (!GetToolBar())
+        return 0;
+
+    HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
+    HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0);
+    if (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;
+        
+        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();
+
+            int position = i;
+            
+            tbButton.idCommand = NewControlId();
+            if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton))
+            {
+                wxLogLastError(wxT("TB_INSERTBUTTON"));
+            }
+        }
+    }
+    m_hMenu = (WXHMENU) hMenu;
+    return m_hMenu;
+#else
+    if ( m_hMenu != 0 )
+        return m_hMenu;

 
     m_hMenu = (WXHMENU)::CreateMenu();
 
     if ( !m_hMenu )
     {
 
     m_hMenu = (WXHMENU)::CreateMenu();
 
     if ( !m_hMenu )
     {

-        wxLogLastError("CreateMenu");
+        wxLogLastError(wxT("CreateMenu"));

     }
     else
     {
     }
     else
     {

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

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

-                               (UINT)m_menus[i]->GetHMenu(),
+                               (UINT)(*it)->GetHMenu(),

                                m_titles[i]) )
             {
                                m_titles[i]) )
             {

-                wxLogLastError("AppendMenu");
+                wxLogLastError(wxT("AppendMenu"));

             }
         }
     }
 
     return m_hMenu;
             }
         }
     }
 
     return m_hMenu;

+#endif
+}
+
+int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
+{
+    wxASSERT(menu);
+    wxASSERT(menu->GetHMenu());
+    wxASSERT(m_hMenu);
+
+#if defined(__WXWINCE__)
+    int totalMSWItems = GetMenuCount();
+#else
+    int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu);
+#endif
+
+    int i; // For old C++ compatibility
+    for(i=wxpos; i<totalMSWItems; i++)
+    {
+        if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
+            return i;
+    }
+    for(i=0; i<wxpos; i++)
+    {
+        if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
+            return i;
+    }
+    wxFAIL;
+    return -1;

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


@@ -575,10 +864,11 @@ WXHMENU wxMenuBar::Create()
 void wxMenuBar::EnableTop(size_t pos, bool enable)
 {
     wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
 void wxMenuBar::EnableTop(size_t pos, bool enable)
 {
     wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );

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

 
     int flag = enable ? MF_ENABLED : MF_GRAYED;
 
 
     int flag = enable ? MF_ENABLED : MF_GRAYED;
 

-    EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag);
+    EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag);

 
     Refresh();
 }
 
     Refresh();
 }


@@ -595,8 +885,10 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     }
     //else: have to modify the existing menu
 
     }
     //else: have to modify the existing menu
 

+    int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
+

     UINT id;
     UINT id;

-    UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION);
+    UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);

     if ( flagsOld == 0xFFFFFFFF )
     {
         wxLogLastError(wxT("GetMenuState"));
     if ( flagsOld == 0xFFFFFFFF )
     {
         wxLogLastError(wxT("GetMenuState"));


@@ -608,18 +900,33 @@ 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, pos);
+        id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos);

     }
     else
     {
         id = pos;
     }
 
     }
     else
     {
         id = pos;
     }
 

-    if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld,
-                      id, label) == (int)0xFFFFFFFF )
+#ifdef __WXWINCE__
+    MENUITEMINFO info;
+    wxZeroMemory(info);
+    info.cbSize = sizeof(info);
+    info.fMask = MIIM_TYPE;
+    info.fType = MFT_STRING;
+    info.cch = label.Length();
+    info.dwTypeData = (LPTSTR) label.c_str();
+    if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, & info) )

     {
     {

-        wxLogLastError("ModifyMenu");
+        wxLogLastError(wxT("SetMenuItemInfo"));

     }
     }

+    
+#else
+    if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
+        id, label) == (int)0xFFFFFFFF )
+    {
+        wxLogLastError(wxT("ModifyMenu"));
+    }
+#endif

 
     Refresh();
 }
 
     Refresh();
 }


@@ -629,23 +936,7 @@ wxString wxMenuBar::GetLabelTop(size_t pos) const
     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
                  wxT("invalid menu index in wxMenuBar::GetLabelTop") );
 
     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
                  wxT("invalid menu index in wxMenuBar::GetLabelTop") );
 

-    return m_titles[pos];
-}
-
-int wxMenuBar::FindMenu(const wxString& title)
-{
-    wxString menuTitle = wxStripMenuCodes(title);
-
-    size_t count = GetMenuCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        wxString title = wxStripMenuCodes(m_titles[i]);
-        if ( menuTitle == title )
-            return i; 
-    }
-
-    return wxNOT_FOUND;
-
+    return wxMenuItem::GetLabelFromText(m_titles[pos]);

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


@@ -656,22 +947,25 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
     if ( !menuOld )
 {
     wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
     if ( !menuOld )

-        return FALSE;
+        return NULL;
+

     m_titles[pos] = title;
 
     if ( IsAttached() )
     {
     m_titles[pos] = title;
 
     if ( IsAttached() )
     {

+        int mswpos = MSWPositionForWxMenu(menuOld,pos);
+

         // can't use ModifyMenu() because it deletes the submenu it replaces
         // can't use ModifyMenu() because it deletes the submenu it replaces

-        if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
+        if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) )

         {
         {

-            wxLogLastError("RemoveMenu");
+            wxLogLastError(wxT("RemoveMenu"));

         }
 
         }
 

-        if ( !::InsertMenu(GetHmenu(), (UINT)pos,
+        if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,

                            MF_BYPOSITION | MF_POPUP | MF_STRING,
                            (UINT)GetHmenuOf(menu), title) )
         {
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
                            (UINT)GetHmenuOf(menu), title) )
         {

-            wxLogLastError("InsertMenu");
+            wxLogLastError(wxT("InsertMenu"));

         }
 
 #if wxUSE_ACCEL
         }
 
 #if wxUSE_ACCEL


@@ -690,22 +984,48 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
 
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {

+    // Find out which MSW item before which we'll be inserting before
+    // wxMenuBarBase::Insert is called and GetMenu(pos) is the new menu.
+    // If IsAttached() is false this won't be used anyway
+    int mswpos = (!IsAttached() || (pos == m_menus.GetCount()))
+        ?   -1 // append the menu
+        :   MSWPositionForWxMenu(GetMenu(pos),pos);
+

     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return FALSE;
 
     m_titles.Insert(title, pos);
 
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return FALSE;
 
     m_titles.Insert(title, pos);
 

-    menu->Attach(this);
-

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

-        if ( !::InsertMenu(GetHmenu(), pos,
+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI)
+        if (!GetToolBar())
+            return FALSE;
+        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;
+        
+        HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
+        tbButton.dwData = (DWORD)hPopupMenu;
+        wxString label = wxStripMenuCodes(title);
+        tbButton.iString = (int) label.c_str();
+            
+        tbButton.idCommand = NewControlId();
+        if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
+        {
+            wxLogLastError(wxT("TB_INSERTBUTTON"));
+            return FALSE;
+        }
+#else
+        if ( !::InsertMenu(GetHmenu(), mswpos,

                            MF_BYPOSITION | MF_POPUP | MF_STRING,
                            (UINT)GetHmenuOf(menu), title) )
         {
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
                            (UINT)GetHmenuOf(menu), title) )
         {

-            wxLogLastError("InsertMenu");
+            wxLogLastError(wxT("InsertMenu"));

         }
         }

-
+#endif

 #if wxUSE_ACCEL
         if ( menu->HasAccels() )
         {
 #if wxUSE_ACCEL
         if ( menu->HasAccels() )
         {


@@ -728,22 +1048,43 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Append(menu, title) )
         return FALSE;
 
     if ( !wxMenuBarBase::Append(menu, title) )
         return FALSE;
 

-    menu->Attach(this);
-

     m_titles.Add(title);
 
     if ( IsAttached() )
     {
     m_titles.Add(title);
 
     if ( IsAttached() )
     {

+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI)
+        if (!GetToolBar())
+            return FALSE;
+        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;
+        
+        size_t pos = GetMenuCount();
+        HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
+        tbButton.dwData = (DWORD)hPopupMenu;
+        wxString label = wxStripMenuCodes(title);
+        tbButton.iString = (int) label.c_str();
+            
+        tbButton.idCommand = NewControlId();
+        if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
+        {
+            wxLogLastError(wxT("TB_INSERTBUTTON"));
+            return FALSE;
+        }
+#else

         if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
                            (UINT)submenu, title) )
         {
             wxLogLastError(wxT("AppendMenu"));
         }
         if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
                            (UINT)submenu, title) )
         {
             wxLogLastError(wxT("AppendMenu"));
         }

+#endif

 
 #if wxUSE_ACCEL
         if ( menu->HasAccels() )
         {
 
 #if wxUSE_ACCEL
         if ( menu->HasAccels() )
         {

-            // need to rebuild accell table
+            // need to rebuild accelerator table

             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL


@@ -762,12 +1103,20 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 
     if ( IsAttached() )
     {
 
     if ( IsAttached() )
     {

-        if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI)
+        if (GetToolBar())

         {
         {

-            wxLogLastError("RemoveMenu");
+            if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0))
+            {
+                wxLogLastError(wxT("TB_DELETEBUTTON"));
+            }

         }
         }

-
-        menu->Detach();
+#else
+        if ( !::RemoveMenu(GetHmenu(), (UINT)MSWPositionForWxMenu(menu,pos), MF_BYPOSITION) )
+        {
+            wxLogLastError(wxT("RemoveMenu"));
+        }
+#endif

 
 #if wxUSE_ACCEL
         if ( menu->HasAccels() )
 
 #if wxUSE_ACCEL
         if ( menu->HasAccels() )


@@ -780,7 +1129,8 @@ wxMenu *wxMenuBar::Remove(size_t pos)
         Refresh();
     }
 
         Refresh();
     }
 

-    m_titles.Remove(pos);
+
+    m_titles.RemoveAt(pos);

 
     return menu;
 }
 
     return menu;
 }


@@ -792,9 +1142,10 @@ void wxMenuBar::RebuildAccelTable()
     // merge the accelerators of all menus into one accel table
     size_t nAccelCount = 0;
     size_t i, count = GetMenuCount();
     // merge the accelerators of all menus into one accel table
     size_t nAccelCount = 0;
     size_t i, count = GetMenuCount();

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

     {
     {

-        nAccelCount += m_menus[i]->GetAccelCount();
+        nAccelCount += (*it)->GetAccelCount();

     }
 
     if ( nAccelCount )
     }
 
     if ( nAccelCount )


@@ -802,9 +1153,9 @@ void wxMenuBar::RebuildAccelTable()
         wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
 
         nAccelCount = 0;
         wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
 
         nAccelCount = 0;

-        for ( i = 0; i < count; i++ )
+        for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )

         {
         {

-            nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]);
+            nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);

         }
 
         m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
         }
 
         m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);


@@ -817,9 +1168,37 @@ void wxMenuBar::RebuildAccelTable()
 
 void wxMenuBar::Attach(wxFrame *frame)
 {
 
 void wxMenuBar::Attach(wxFrame *frame)
 {

-//    wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
+    wxMenuBarBase::Attach(frame);

 
 

-    m_menuBarFrame = frame;
+#if defined(__WXWINCE__) && _WIN32_WCE >= 400
+    if (!m_hMenu)
+        this->Create();
+#if wxUSE_POCKETPC_UI
+    if (GetToolBar())
+    {
+        HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
+        if (!CommandBar_InsertMenubarEx(hCommandBar, NULL, (LPTSTR) m_hMenu, 0))
+        {
+            wxLogLastError(wxT("CommandBar_InsertMenubarEx"));
+        }
+    }
+#else
+    if (!m_commandBar)
+        m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId());
+    if (m_commandBar)
+    {
+        if (m_hMenu)
+        {
+            if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, (LPTSTR) m_hMenu, 0))
+            {
+                wxLogLastError(wxT("CommandBar_InsertMenubarEx"));
+            }
+        }
+    }
+#endif
+    // wxUSE_POCKETPC_UI
+#endif
+    // __WXWINCE__ && _WIN32_WCE >= 400

 
 #if wxUSE_ACCEL
     RebuildAccelTable();
 
 #if wxUSE_ACCEL
     RebuildAccelTable();


@@ -828,44 +1207,7 @@ void wxMenuBar::Attach(wxFrame *frame)
 
 void wxMenuBar::Detach()
 {
 
 void wxMenuBar::Detach()
 {

-//    ::DestroyMenu((HMENU)m_hMenu);
-    m_hMenu = (WXHMENU)NULL;
-    m_menuBarFrame = NULL;
-}
-
-
-// ---------------------------------------------------------------------------
-// wxMenuBar searching for menu items
-// ---------------------------------------------------------------------------
-
-// Find the itemString in menuString, and return the item id or wxNOT_FOUND
-int wxMenuBar::FindMenuItem(const wxString& menuString,
-                            const wxString& itemString) const
-{
-    wxString menuLabel = wxStripMenuCodes(menuString);
-    size_t count = GetMenuCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        wxString title = wxStripMenuCodes(m_titles[i]);
-        if ( menuString == title )
-            return m_menus[i]->FindItem(itemString);
-    }
-
-    return wxNOT_FOUND;
-}
-
-wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
-{
-    if ( itemMenu )
-        *itemMenu = NULL;
-
-    wxMenuItem *item = NULL;
-    size_t count = GetMenuCount();
-    for ( size_t i = 0; !item && (i < count); i++ )
-    {
-        item = m_menus[i]->FindItem(id, itemMenu);
-    }
-
-    return item;
+    wxMenuBarBase::Detach();

 }
 
 }
 

+#endif // wxUSE_MENUS