X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b3dc8019a520ce5e166c8ae9098ba020f8b3f94..d6c11fa975af689cc570ee6f1cfc5322fa7fd564:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index f89a45c790..94e9827cdb 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -29,6 +29,7 @@ #include "wx/menu.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/frame.h" #include "wx/utils.h" #include "wx/intl.h" @@ -47,7 +48,6 @@ #include #include #include -#include #if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__) #include #endif @@ -313,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(); @@ -401,28 +401,56 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) BOOL ok = false; +#if wxUSE_OWNER_DRAWN + // Currently, mixing owner-drawn and non-owner-drawn items results in + // inconsistent margins, so we force this to be owner-drawn if any other + // items already are. Later we might want to use a boolean in the wxMenu + // to avoid search. Also we might make this fix unnecessary by getting the correct + // margin using NONCLIENTMETRICS. + if ( !pItem->IsOwnerDrawn() && !pItem->IsSeparator() ) + { + // Check if any other items are ownerdrawn, and make ownerdrawn if so + wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + while (node) + { + if (node->GetData()->IsOwnerDrawn()) + { + pItem->SetOwnerDrawn(true); + break; + } + node = node->GetNext(); + } + } +#endif + // 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() && + // is the item owner-drawn just because of the [checked] bitmap? + if ( (pItem->GetBitmap(false).Ok() || pItem->GetBitmap(true).Ok()) && !pItem->GetTextColour().Ok() && !pItem->GetBackgroundColour().Ok() && - !pItem->GetFont().Ok() && - !pItem->GetBitmap(true).Ok() ) + !pItem->GetFont().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 +#if defined(MIIM_BITMAP) && (_WIN32_WINNT >= 0x0500) 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; + if ( pItem->IsCheckable() ) + { + // need to set checked/unchecked bitmaps as otherwise our + // MSWOnDrawItem() item is not called + mii.fMask |= MIIM_CHECKMARKS; + } + mii.cch = itemText.length(); mii.dwTypeData = wx_const_cast(wxChar *, itemText.c_str()); @@ -440,11 +468,16 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) // 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() mii.dwItemData = wx_reinterpret_cast(ULONG_PTR, pItem); + if ( pItem->IsCheckable() ) + { + mii.hbmpChecked = + mii.hbmpUnchecked = HBMMENU_CALLBACK; + } mii.hbmpItem = HBMMENU_CALLBACK; ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii); @@ -492,7 +525,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__ @@ -502,7 +535,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) ) @@ -603,7 +636,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++ ) @@ -614,7 +647,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 @@ -637,7 +670,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(); } @@ -651,7 +684,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 { @@ -845,6 +878,9 @@ wxMenuBar::~wxMenuBar() void wxMenuBar::Refresh() { + if ( IsFrozen() ) + return; + wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); #if defined(WINCE_WITHOUT_COMMANDBAR) @@ -862,7 +898,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.