X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c25f373e2b49e6d97c45d3f73da7edd0021ab2b3..cb0b7b7d811356f729315fc14c7e0d311f43384d:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 25ea2adc19..85d93d73a9 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/msw/menu.cpp // Purpose: wxMenu, wxMenuBar, wxMenuItem // Author: Julian Smart // Modified by: Vadim Zeitlin @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "menu.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -51,7 +47,7 @@ #include #include #include -#if _WIN32_WCE < 400 +#if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__) #include #endif @@ -62,12 +58,21 @@ // other standard headers #include +#if wxUSE_OWNER_DRAWN && defined(MIIM_BITMAP) + #include "wx/dynlib.h" +#endif + +#ifndef MNS_CHECKORBMP + #define MNS_CHECKORBMP 0x04000000 +#endif +#ifndef MIM_STYLE + #define MIM_STYLE 0x00000010 +#endif + // ---------------------------------------------------------------------------- // global variables // ---------------------------------------------------------------------------- -extern wxMenu *wxCurrentPopupMenu; - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -80,7 +85,8 @@ static const int idMenuTitle = -3; // ---------------------------------------------------------------------------- // make the given menu item default -static void SetDefaultMenuItem(HMENU hmenu, UINT id) +static void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu), + UINT WXUNUSED_IN_WINCE(id)) { #ifndef __WXWINCE__ MENUITEMINFO mii; @@ -103,7 +109,8 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) wxZeroMemory(info); info.cbSize = sizeof(info); info.fMask = MIIM_STATE; - if ( !GetMenuItemInfo(hMenu, id, flags & MF_BYCOMMAND ? FALSE : TRUE, & info) ) + // MF_BYCOMMAND is zero so test MF_BYPOSITION + if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) ) wxLogLastError(wxT("GetMenuItemInfo")); return info.fState; } @@ -113,9 +120,9 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) // implementation // ============================================================================ -#include +#include "wx/listimpl.cpp" -WX_DEFINE_LIST( wxMenuInfoList ) ; +WX_DEFINE_LIST( wxMenuInfoList ) #if wxUSE_EXTENDED_RTTI @@ -135,9 +142,9 @@ template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVa } wxBEGIN_PROPERTIES_TABLE(wxMenu) - wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent) + 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 + 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() @@ -163,14 +170,14 @@ IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow ,"wx/menu.h",wxMenuBarS 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( 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 ) +wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title ) wxCOLLECTION_TYPE_INFO( wxMenuInfo * , wxMenuInfoList ) ; @@ -214,7 +221,7 @@ const wxMenuInfoList& wxMenuBar::GetMenuInfos() const // Construct a menu with optional title (then use append) void wxMenu::Init() { - m_doBreak = FALSE; + m_doBreak = false; m_startRadioGroup = -1; // create the menu @@ -225,7 +232,7 @@ void wxMenu::Init() } // if we have a title, insert it in the beginning of the menu - if ( !!m_title ) + if ( !m_title.empty() ) { Append(idMenuTitle, m_title); AppendSeparator(); @@ -255,7 +262,7 @@ wxMenu::~wxMenu() void wxMenu::Break() { // this will take effect during the next call to Append() - m_doBreak = TRUE; + m_doBreak = true; } void wxMenu::Attach(wxMenuBarBase *menubar) @@ -294,6 +301,16 @@ void wxMenu::UpdateAccel(wxMenuItem *item) } else if ( !item->IsSeparator() ) { + // recurse upwards: we should only modify m_accels of the top level + // menus, not of the submenus as wxMenuBar doesn't look at them + // (alternative and arguable cleaner solution would be to recurse + // downwards in GetAccelCount() and CopyAccels()) + if ( GetParent() ) + { + GetParent()->UpdateAccel(item); + return; + } + // find the (new) accel for this item wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText()); if ( accel ) @@ -321,7 +338,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item) if ( IsAttached() ) { - m_menuBar->RebuildAccelTable(); + GetMenuBar()->RebuildAccelTable(); } } //else: it is a separator, they can't have accels, nothing to do @@ -342,7 +359,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) // (and don't forget to reset the flag) if ( m_doBreak ) { flags |= MF_MENUBREAK; - m_doBreak = FALSE; + m_doBreak = false; } if ( pItem->IsSeparator() ) { @@ -366,65 +383,150 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) id = pItem->GetId(); } -#ifdef __WXWINCE__ - wxString strippedString; -#endif - LPCTSTR pData; + // prepare to insert the item in the menu + wxString itemText = pItem->GetText(); + LPCTSTR pData = NULL; + if ( pos == (size_t)-1 ) + { + // append at the end (note that the item is already appended to + // internal data structures) + pos = GetMenuItemCount() - 1; + } + + // adjust position to account for the title, if any + if ( !m_title.empty() ) + pos += 2; // for the title itself and its separator + BOOL ok = false; + + // check if we have something more than a simple text item #if wxUSE_OWNER_DRAWN - if ( pItem->IsOwnerDrawn() ) { // want to get {Measure|Draw}Item messages? - // item draws itself, pass pointer to it in data parameter - flags |= MF_OWNERDRAW; - pData = (LPCTSTR)pItem; + 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() ) + { + // try to use InsertMenuItem() as it's guaranteed to look correctly + // while our owner-drawning code is not + + // first compile-time check +#ifdef MIIM_BITMAP + WinStruct mii; + + // now run-time one: MIIM_BITMAP only works under WinME/2000+ + if ( wxGetWinVersion() >= wxWinVersion_98 ) + { + mii.fMask = MIIM_STRING | MIIM_DATA | MIIM_BITMAP; + mii.cch = itemText.length(); + mii.dwTypeData = wx_const_cast(wxChar *, itemText.c_str()); + + if (flags & MF_POPUP) + { + mii.fMask |= MIIM_SUBMENU; + mii.hSubMenu = (HMENU)pItem->GetSubMenu()->GetHMenu(); + } + else + { + mii.fMask |= MIIM_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 inverses 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; + + ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii); + if ( !ok ) + { + wxLogLastError(wxT("InsertMenuItem()")); + } + else // InsertMenuItem() ok + { + // we need to remove the extra indent which is reserved for + // the checkboxes by default as it looks ugly unless check + // boxes are used together with bitmaps and this is not the + // case in wx API + WinStruct mi; + + // don't call SetMenuInfo() directly, this would prevent + // the app from starting up under Windows 95/NT 4 + typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *); + + wxDynamicLibrary dllUser(_T("user32")); + 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)")); + } + + // 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(); + } + } +#endif // MIIM_BITMAP + } + + if ( !ok ) + { + // item draws itself, pass pointer to it in data parameter + flags |= MF_OWNERDRAW; + pData = (LPCTSTR)pItem; + } } else -#endif +#endif // wxUSE_OWNER_DRAWN { // 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(); + itemText = wxMenuItem::GetLabelFromText(itemText); #endif - } - BOOL ok; - if ( pos == (size_t)-1 ) - { - ok = ::AppendMenu(GetHmenu(), flags, id, pData); - } - else - { - ok = ::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData); + pData = (wxChar*)itemText.c_str(); } + // item might have been already inserted by InsertMenuItem() above if ( !ok ) { - wxLogLastError(wxT("Insert or AppendMenu")); + if ( !::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData) ) + { + wxLogLastError(wxT("InsertMenu[Item]()")); - return FALSE; + return false; + } } + // if we just appended the title, highlight it -#ifdef __WIN32__ 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() && m_menuBar->IsAttached() ) + if ( IsAttached() && GetMenuBar()->IsAttached() ) { - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } - return TRUE; + return true; } void wxMenu::EndRadioGroup() @@ -437,7 +539,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) { wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") ); - bool check = FALSE; + bool check = false; if ( item->GetKind() == wxITEM_RADIO ) { @@ -453,7 +555,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) item->SetRadioGroupEnd(m_startRadioGroup); // ensure that we have a checked item in the radio group - check = TRUE; + check = true; } else // extend the current radio group { @@ -484,7 +586,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) if ( check ) { // check the item initially - item->Check(TRUE); + item->Check(true); } return item; @@ -532,10 +634,10 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) wxLogLastError(wxT("RemoveMenu")); } - if ( IsAttached() && m_menuBar->IsAttached() ) + if ( IsAttached() && GetMenuBar()->IsAttached() ) { // otherwise, the chane won't be visible - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } // and from internal data structures @@ -569,14 +671,14 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const void wxMenu::SetTitle(const wxString& label) { - bool hasNoTitle = m_title.IsEmpty(); + bool hasNoTitle = m_title.empty(); m_title = label; HMENU hMenu = GetHmenu(); if ( hasNoTitle ) { - if ( !label.IsEmpty() ) + if ( !label.empty() ) { if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, (unsigned)idMenuTitle, m_title) || @@ -588,7 +690,7 @@ void wxMenu::SetTitle(const wxString& label) } else { - if ( label.IsEmpty() ) + if ( label.empty() ) { // remove the title and the separator after it if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) || @@ -606,7 +708,7 @@ void wxMenu::SetTitle(const wxString& label) info.cbSize = sizeof(info); info.fMask = MIIM_TYPE; info.fType = MFT_STRING; - info.cch = m_title.Length(); + info.cch = m_title.length(); info.dwTypeData = (LPTSTR) m_title.c_str(); if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) ) { @@ -625,7 +727,7 @@ void wxMenu::SetTitle(const wxString& label) #ifdef __WIN32__ // put the title string in bold face - if ( !m_title.IsEmpty() ) + if ( !m_title.empty() ) { SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle); } @@ -639,19 +741,15 @@ void wxMenu::SetTitle(const wxString& label) bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) { // ignore commands from the menu title - - // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!! if ( id != (WXWORD)idMenuTitle ) { - // 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); + // 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)); } - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -662,8 +760,8 @@ 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; } @@ -676,14 +774,15 @@ void wxMenuBar::Init() { m_eventHandler = this; m_hMenu = 0; -#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) +#if wxUSE_TOOLBAR && defined(__WXWINCE__) 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) +#if defined(WINCE_WITH_COMMANDBAR) m_commandBar = NULL; + m_adornmentsAdded = false; #endif } @@ -697,13 +796,13 @@ wxMenuBar::wxMenuBar( long WXUNUSED(style) ) Init(); } -wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) +wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED(style)) { Init(); m_titles.Alloc(count); - for ( int i = 0; i < count; i++ ) + for ( size_t i = 0; i < count; i++ ) { m_menus.Append(menus[i]); m_titles.Add(titles[i]); @@ -716,20 +815,24 @@ 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 defined(WINCE_WITHOUT_COMMANDBAR) && defined(__POCKETPC__) if (GetToolBar()) - GetToolBar()->SetMenuBar(NULL); + { + wxToolMenuBar* toolMenuBar = wxDynamicCast(GetToolBar(), wxToolMenuBar); + if (toolMenuBar) + toolMenuBar->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) +#if defined(WINCE_WITH_COMMANDBAR) ::DestroyWindow((HWND) m_commandBar); m_commandBar = (WXHWND) NULL; #else ::DestroyMenu((HMENU)m_hMenu); -#endif +#endif m_hMenu = (WXHMENU)NULL; } #endif @@ -743,12 +846,12 @@ void wxMenuBar::Refresh() { wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); -#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (GetToolBar()) { CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0); } -#elif defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) +#elif defined(WINCE_WITH_COMMANDBAR) if (m_commandBar) DrawMenuBar((HWND) m_commandBar); #else @@ -762,7 +865,7 @@ WXHMENU wxMenuBar::Create() // 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 defined(WINCE_WITHOUT_COMMANDBAR) if ( m_hMenu != 0 ) return m_hMenu; @@ -773,12 +876,12 @@ WXHMENU wxMenuBar::Create() HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0); if (hMenu) { - TBBUTTON tbButton; + 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++) { @@ -788,7 +891,7 @@ WXHMENU wxMenuBar::Create() tbButton.iString = (int) label.c_str(); int position = i; - + tbButton.idCommand = NewControlId(); if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton)) { @@ -913,13 +1016,13 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) info.cbSize = sizeof(info); info.fMask = MIIM_TYPE; info.fType = MFT_STRING; - info.cch = label.Length(); + info.cch = label.length(); info.dwTypeData = (LPTSTR) label.c_str(); if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, & info) ) { wxLogLastError(wxT("SetMenuItemInfo")); } - + #else if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld, id, label) == (int)0xFFFFFFFF ) @@ -951,7 +1054,11 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) m_titles[pos] = title; - if ( IsAttached() ) +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (IsAttached()) +#else + if (GetHmenu()) +#endif { int mswpos = MSWPositionForWxMenu(menuOld,pos); @@ -976,7 +1083,8 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } return menuOld; @@ -987,37 +1095,45 @@ 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())) + bool isAttached = +#if defined(WINCE_WITHOUT_COMMANDBAR) + IsAttached(); +#else + (GetHmenu() != 0); +#endif + + int mswpos = (!isAttached || (pos == m_menus.GetCount())) ? -1 // append the menu : MSWPositionForWxMenu(GetMenu(pos),pos); if ( !wxMenuBarBase::Insert(pos, menu, title) ) - return FALSE; + return false; m_titles.Insert(title, pos); - if ( IsAttached() ) + if ( isAttached ) { -#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (!GetToolBar()) - return FALSE; - TBBUTTON tbButton; + 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; + return false; } + wxUnusedVar(mswpos); #else if ( !::InsertMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_POPUP | MF_STRING, @@ -1034,44 +1150,49 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } - return TRUE; + return true; } bool wxMenuBar::Append(wxMenu *menu, const wxString& title) { WXHMENU submenu = menu ? menu->GetHMenu() : 0; - wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") ); + wxCHECK_MSG( submenu, false, wxT("can't append invalid menu to menubar") ); if ( !wxMenuBarBase::Append(menu, title) ) - return FALSE; + return false; m_titles.Add(title); - if ( IsAttached() ) +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (IsAttached()) +#else + if (GetHmenu()) +#endif { -#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (!GetToolBar()) - return FALSE; - TBBUTTON tbButton; + 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; + return false; } #else if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING, @@ -1089,10 +1210,11 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } - return TRUE; + return true; } wxMenu *wxMenuBar::Remove(size_t pos) @@ -1101,9 +1223,13 @@ wxMenu *wxMenuBar::Remove(size_t pos) if ( !menu ) return NULL; - if ( IsAttached() ) +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (IsAttached()) +#else + if (GetHmenu()) +#endif { -#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (GetToolBar()) { if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0)) @@ -1126,10 +1252,10 @@ wxMenu *wxMenuBar::Remove(size_t pos) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } - m_titles.RemoveAt(pos); return menu; @@ -1170,19 +1296,9 @@ void wxMenuBar::Attach(wxFrame *frame) { wxMenuBarBase::Attach(frame); -#if defined(__WXWINCE__) && _WIN32_WCE >= 400 +#if defined(WINCE_WITH_COMMANDBAR) 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) @@ -1196,15 +1312,29 @@ void wxMenuBar::Attach(wxFrame *frame) } } #endif - // wxUSE_POCKETPC_UI -#endif - // __WXWINCE__ && _WIN32_WCE >= 400 #if wxUSE_ACCEL RebuildAccelTable(); #endif // wxUSE_ACCEL } +#if defined(WINCE_WITH_COMMANDBAR) +bool wxMenuBar::AddAdornments(long style) +{ + if (m_adornmentsAdded || !m_commandBar) + return false; + + if (style & wxCLOSE_BOX) + { + if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0)) + wxLogLastError(wxT("CommandBar_AddAdornments")); + else + return true; + } + return false; +} +#endif + void wxMenuBar::Detach() { wxMenuBarBase::Detach();