X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/259c43f679ca655362b5a439e11c87fc0666d663..2121eb69fa8d49f4484f7170159e61f2e8885de4:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index f0069e6407..28581bd470 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 @@ -26,9 +26,11 @@ #if wxUSE_MENUS +#include "wx/menu.h" + #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/frame.h" - #include "wx/menu.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" @@ -46,7 +48,6 @@ #include #include #include -#include #if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__) #include #endif @@ -120,7 +121,7 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) // implementation // ============================================================================ -#include +#include "wx/listimpl.cpp" WX_DEFINE_LIST( wxMenuInfoList ) @@ -312,7 +313,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item) } // find the (new) accel for this item - wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText()); + wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetText()); if ( accel ) accel->m_command = item->GetId(); @@ -408,10 +409,11 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) if ( pItem->GetBitmap().Ok() && !pItem->GetTextColour().Ok() && !pItem->GetBackgroundColour().Ok() && - !pItem->GetFont().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 + // try to use InsertMenuItem() as it's guaranteed to look correct + // while our owner-drawn code is not // first compile-time check #ifdef MIIM_BITMAP @@ -420,15 +422,25 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) // now run-time one: MIIM_BITMAP only works under WinME/2000+ if ( wxGetWinVersion() >= wxWinVersion_98 ) { - mii.fMask = MIIM_ID | MIIM_STRING | MIIM_DATA | MIIM_BITMAP; - mii.wID = id; + 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 + // 2. worse, Windows inverts the bitmap for the selected // item and this looks downright ugly // // so instead draw it ourselves in MSWOnDrawItem() @@ -480,7 +492,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) else #endif // wxUSE_OWNER_DRAWN { - // menu is just a normal string (passed in data parameter) + // item is just a normal string (passed in data parameter) flags |= MF_STRING; #ifdef __WXWINCE__ @@ -490,7 +502,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) pData = (wxChar*)itemText.c_str(); } - // item might have been already inserted by InsertMenuItem() above + // item might have already been inserted by InsertMenuItem() above if ( !ok ) { if ( !::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData) ) @@ -591,7 +603,7 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - // we need to find the items position in the child list + // we need to find the item's position in the child list size_t pos; wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); for ( pos = 0; node; pos++ ) @@ -602,7 +614,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) node = node->GetNext(); } - // DoRemove() (unlike Remove) can only be called for existing item! + // DoRemove() (unlike Remove) can only be called for an existing item! wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") ); #if wxUSE_ACCEL @@ -625,7 +637,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) if ( IsAttached() && GetMenuBar()->IsAttached() ) { - // otherwise, the chane won't be visible + // otherwise, the change won't be visible GetMenuBar()->Refresh(); } @@ -639,7 +651,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) #if wxUSE_ACCEL -// create the wxAcceleratorEntries for our accels and put them into provided +// create the wxAcceleratorEntries for our accels and put them into the provided // array - return the number of accels we have size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const { @@ -697,7 +709,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) ) { @@ -833,6 +845,9 @@ wxMenuBar::~wxMenuBar() void wxMenuBar::Refresh() { + if ( IsFrozen() ) + return; + wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); #if defined(WINCE_WITHOUT_COMMANDBAR) @@ -850,7 +865,7 @@ void wxMenuBar::Refresh() WXHMENU wxMenuBar::Create() { - // Note: this totally doesn't work on Smartphone, + // Note: this doesn't work at all 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. @@ -863,7 +878,9 @@ WXHMENU wxMenuBar::Create() HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0); - if (hMenu) + + // hMenu may be zero on Windows Mobile 5. So add the menus anyway. + if (1) // (hMenu) { TBBUTTON tbButton; memset(&tbButton, 0, sizeof(TBBUTTON)); @@ -1005,7 +1022,7 @@ 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) ) { @@ -1043,7 +1060,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); @@ -1068,7 +1089,8 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } return menuOld; @@ -1079,7 +1101,14 @@ 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); @@ -1088,9 +1117,9 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) m_titles.Insert(title, pos); - if ( IsAttached() ) + if ( isAttached ) { -#if defined(WINCE_WITHOUT_COMMANDAR) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (!GetToolBar()) return false; TBBUTTON tbButton; @@ -1110,6 +1139,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) wxLogLastError(wxT("TB_INSERTBUTTON")); return false; } + wxUnusedVar(mswpos); #else if ( !::InsertMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_POPUP | MF_STRING, @@ -1126,7 +1156,8 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } return true; @@ -1142,9 +1173,13 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title) m_titles.Add(title); - if ( IsAttached() ) +#if defined(WINCE_WITHOUT_COMMANDBAR) + if (IsAttached()) +#else + if (GetHmenu()) +#endif { -#if defined(WINCE_WITHOUT_COMMANDAR) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (!GetToolBar()) return false; TBBUTTON tbButton; @@ -1181,7 +1216,8 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } return true; @@ -1193,9 +1229,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(WINCE_WITHOUT_COMMANDAR) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (GetToolBar()) { if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0)) @@ -1218,10 +1258,10 @@ wxMenu *wxMenuBar::Remove(size_t pos) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } - m_titles.RemoveAt(pos); return menu;