#if wxUSE_MENUS
+#include "wx/menu.h"
+
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/frame.h"
- #include "wx/menu.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#include <tchar.h>
#include <ole2.h>
#include <shellapi.h>
-#include <commctrl.h>
#if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__)
#include <aygshell.h>
#endif
}
// 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();
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
// 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()
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__
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) )
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++ )
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
if ( IsAttached() && GetMenuBar()->IsAttached() )
{
- // otherwise, the chane won't be visible
+ // otherwise, the change won't be visible
GetMenuBar()->Refresh();
}
#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
{
void wxMenuBar::Refresh()
{
+ if ( IsFrozen() )
+ return;
+
wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
#if defined(WINCE_WITHOUT_COMMANDBAR)
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.
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));
m_titles[pos] = title;
- if ( IsAttached() )
+#if defined(WINCE_WITHOUT_COMMANDBAR)
+ if (IsAttached())
+#else
+ if (GetHmenu())
+#endif
{
int mswpos = MSWPositionForWxMenu(menuOld,pos);
}
#endif // wxUSE_ACCEL
- Refresh();
+ if (IsAttached())
+ Refresh();
}
return menuOld;
// 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);
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;
wxLogLastError(wxT("TB_INSERTBUTTON"));
return false;
}
+ wxUnusedVar(mswpos);
#else
if ( !::InsertMenu(GetHmenu(), mswpos,
MF_BYPOSITION | MF_POPUP | MF_STRING,
}
#endif // wxUSE_ACCEL
- Refresh();
+ if (IsAttached())
+ Refresh();
}
return true;
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;
}
#endif // wxUSE_ACCEL
- Refresh();
+ if (IsAttached())
+ Refresh();
}
return true;
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))
}
#endif // wxUSE_ACCEL
- Refresh();
+ if (IsAttached())
+ Refresh();
}
-
m_titles.RemoveAt(pos);
return menu;
projects / wxWidgets.git / blobdiff