#include "wx/menu.h"
#ifndef WX_PRECOMP
- #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/frame.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/image.h"
#endif
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
+#include "wx/scopedarray.h"
+
#include "wx/msw/private.h"
+#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#ifdef __WXWINCE__
#include <windows.h>
// other standard headers
#include <string.h>
-#if wxUSE_OWNER_DRAWN && defined(MIIM_BITMAP)
+#if wxUSE_OWNER_DRAWN
#include "wx/dynlib.h"
#endif
// ----------------------------------------------------------------------------
// the (popup) menu title has this special id
-static const int idMenuTitle = -3;
+static const int idMenuTitle = wxID_NONE;
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
+namespace
+{
+
// make the given menu item default
-static void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
- UINT WXUNUSED_IN_WINCE(id))
+void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
+ UINT WXUNUSED_IN_WINCE(id))
{
#ifndef __WXWINCE__
MENUITEMINFO mii;
{
wxLogLastError(wxT("SetMenuItemInfo"));
}
-#endif
+#endif // !__WXWINCE__
+}
+
+// make the given menu item owner-drawn
+void SetOwnerDrawnMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
+ UINT WXUNUSED_IN_WINCE(id),
+ ULONG_PTR WXUNUSED_IN_WINCE(data),
+ BOOL WXUNUSED_IN_WINCE(byPositon = FALSE))
+{
+#ifndef __WXWINCE__
+ MENUITEMINFO mii;
+ wxZeroMemory(mii);
+ mii.cbSize = sizeof(MENUITEMINFO);
+ mii.fMask = MIIM_FTYPE | MIIM_DATA;
+ mii.fType = MFT_OWNERDRAW;
+ mii.dwItemData = data;
+
+ if ( reinterpret_cast<wxMenuItem*>(data)->IsSeparator() )
+ mii.fType |= MFT_SEPARATOR;
+
+ if ( !::SetMenuItemInfo(hmenu, id, byPositon, &mii) )
+ {
+ wxLogLastError(wxT("SetMenuItemInfo"));
+ }
+#endif // !__WXWINCE__
}
#ifdef __WXWINCE__
info.fMask = MIIM_STATE;
// MF_BYCOMMAND is zero so test MF_BYPOSITION
if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) )
+ {
wxLogLastError(wxT("GetMenuItemInfo"));
+ }
return info.fState;
}
-#endif
+#endif // __WXWINCE__
+
+inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
+{
+ return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
+ bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);
+}
+
+} // anonymous namespace
// ============================================================================
// implementation
for( size_t i = 0 ; i < GetMenuCount() ; ++i )
{
wxMenuInfo* info = new wxMenuInfo() ;
- info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetLabelTop(i) ) ;
+ info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetMenuLabel(i) ) ;
list->Append( info ) ;
}
return m_menuInfos ;
m_doBreak = false;
m_startRadioGroup = -1;
+#if wxUSE_OWNER_DRAWN
+ m_ownerDrawn = false;
+ m_maxBitmapWidth = 0;
+ m_maxAccelWidth = -1;
+#endif // wxUSE_OWNER_DRAWN
+
// create the menu
m_hMenu = (WXHMENU)CreatePopupMenu();
if ( !m_hMenu )
// if we have a title, insert it in the beginning of the menu
if ( !m_title.empty() )
{
- Append(idMenuTitle, m_title);
- AppendSeparator();
+ const wxString title = m_title;
+ m_title.clear(); // so that SetTitle() knows there was no title before
+ SetTitle(title);
}
}
}
// find the (new) accel for this item
- wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetText());
+ wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetItemLabel());
if ( accel )
accel->m_command = item->GetId();
{
GetMenuBar()->RebuildAccelTable();
}
+
+ ResetMaxAccelWidth();
}
//else: it is a separator, they can't have accels, nothing to do
}
#endif // wxUSE_ACCEL
+namespace
+{
+
+// helper of DoInsertOrAppend(): returns the HBITMAP to use in MENUITEMINFO
+HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true)
+{
+ // Under versions of Windows older than Vista 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 inverts the bitmap for the selected
+ // item and this looks downright ugly
+ //
+ // So we prefer to instead draw it ourselves in MSWOnDrawItem().by using
+ // HBMMENU_CALLBACK when inserting it
+ //
+ // However under Vista using HBMMENU_CALLBACK causes the entire menu to be
+ // drawn using the classic theme instead of the current one and it does
+ // handle transparency just fine so do use the real bitmap there
+#if wxUSE_IMAGE
+ if ( wxGetWinVersion() >= wxWinVersion_Vista )
+ {
+ wxBitmap bmp = pItem->GetBitmap(checked);
+ if ( bmp.IsOk() )
+ {
+ // we must use PARGB DIB for the menu bitmaps so ensure that we do
+ wxImage img(bmp.ConvertToImage());
+ if ( !img.HasAlpha() )
+ {
+ img.InitAlpha();
+ pItem->SetBitmap(img, checked);
+ }
+
+ return GetHbitmapOf(pItem->GetBitmap(checked));
+ }
+ //else: bitmap is not set
+
+ return NULL;
+ }
+#endif // wxUSE_IMAGE
+
+ return HBMMENU_CALLBACK;
+}
+
+} // anonymous namespace
+
// append a new item or submenu to the menu
bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
{
UpdateAccel(pItem);
#endif // wxUSE_ACCEL
- UINT flags = 0;
+ // we should support disabling the item even prior to adding it to the menu
+ UINT flags = pItem->IsEnabled() ? MF_ENABLED : MF_GRAYED;
// if "Break" has just been called, insert a menu break before this item
// (and don't forget to reset the flag)
// id is the numeric id for normal menu items and HMENU for submenus as
// required by ::AppendMenu() API
- UINT id;
+ UINT_PTR id;
wxMenu *submenu = pItem->GetSubMenu();
if ( submenu != NULL ) {
wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") );
submenu->SetParent(this);
- id = (UINT)submenu->GetHMenu();
+ id = (UINT_PTR)submenu->GetHMenu();
flags |= MF_POPUP;
}
else {
- id = pItem->GetId();
+ id = pItem->GetMSWId();
}
// prepare to insert the item in the menu
- wxString itemText = pItem->GetText();
+ wxString itemText = pItem->GetItemLabel();
LPCTSTR pData = NULL;
if ( pos == (size_t)-1 )
{
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
+ // Under older systems mixing owner-drawn and non-owner-drawn items results
+ // in inconsistent margins, so we force this one to be owner-drawn if any
+ // other items already are.
+ if ( m_ownerDrawn )
+ pItem->SetOwnerDrawn(true);
+#endif // wxUSE_OWNER_DRAWN
// 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 [checked] bitmap?
- if ( (pItem->GetBitmap(false).Ok() || pItem->GetBitmap(true).Ok()) &&
- !pItem->GetTextColour().Ok() &&
- !pItem->GetBackgroundColour().Ok() &&
- !pItem->GetFont().Ok() )
+#ifndef __DMC__
+
+ if ( !m_ownerDrawn && !pItem->IsSeparator() )
{
- // try to use InsertMenuItem() as it's guaranteed to look correct
- // while our owner-drawn code is not
+ // MIIM_BITMAP only works under WinME/2000+ so we always use owner
+ // drawn item under the previous versions and we also have to use
+ // them in any case if the item has custom colours or font
+ static const wxWinVersion winver = wxGetWinVersion();
+ bool mustUseOwnerDrawn = winver < wxWinVersion_98 ||
+ pItem->GetTextColour().Ok() ||
+ pItem->GetBackgroundColour().Ok() ||
+ pItem->GetFont().Ok();
+
+ if ( !mustUseOwnerDrawn )
+ {
+ const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
+ bmpChecked = pItem->GetBitmap(true);
- // first compile-time check
-#if defined(MIIM_BITMAP) && (_WIN32_WINNT >= 0x0500)
- WinStruct<MENUITEMINFO> mii;
+ if ( (bmpUnchecked.Ok() && IsGreaterThanStdSize(bmpUnchecked)) ||
+ (bmpChecked.Ok() && IsGreaterThanStdSize(bmpChecked)) )
+ {
+ mustUseOwnerDrawn = true;
+ }
+ }
- // now run-time one: MIIM_BITMAP only works under WinME/2000+
- if ( wxGetWinVersion() >= wxWinVersion_98 )
+ // use InsertMenuItem() if possible as it's guaranteed to look
+ // correct while our owner-drawn code is not
+ if ( !mustUseOwnerDrawn )
{
- mii.fMask = MIIM_STRING | MIIM_DATA | MIIM_BITMAP;
+ WinStruct<MENUITEMINFO> mii;
+ mii.fMask = MIIM_STRING | MIIM_DATA;
+
+ // don't set hbmpItem for the checkable items as it would
+ // be used for both checked and unchecked state
if ( pItem->IsCheckable() )
{
- // need to set checked/unchecked bitmaps as otherwise our
- // MSWOnDrawItem() item is not called
mii.fMask |= MIIM_CHECKMARKS;
+ mii.hbmpChecked = GetHBitmapForMenu(pItem, true);
+ mii.hbmpUnchecked = GetHBitmapForMenu(pItem, false);
+ }
+ else if ( pItem->GetBitmap().IsOk() )
+ {
+ mii.fMask |= MIIM_BITMAP;
+ mii.hbmpItem = GetHBitmapForMenu(pItem);
}
mii.cch = itemText.length();
- mii.dwTypeData = wx_const_cast(wxChar *, itemText.c_str());
+ mii.dwTypeData = const_cast<wxChar *>(itemText.wx_str());
- if (flags & MF_POPUP)
+ if ( flags & MF_POPUP )
{
mii.fMask |= MIIM_SUBMENU;
- mii.hSubMenu = (HMENU)pItem->GetSubMenu()->GetHMenu();
+ mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu());
}
else
{
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 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;
+ mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
if ( !ok )
// the app from starting up under Windows 95/NT 4
typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *);
- wxDynamicLibrary dllUser(_T("user32"));
+ wxDynamicLibrary dllUser(wxT("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)"));
+ {
+ wxLogLastError(wxT("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();
+ pItem->SetOwnerDrawn(false);
}
}
-#endif // MIIM_BITMAP
}
+#endif // __DMC__
if ( !ok )
{
// item draws itself, pass pointer to it in data parameter
flags |= MF_OWNERDRAW;
pData = (LPCTSTR)pItem;
+
+ bool updateAllMargins = false;
+
+ // get size of bitmap always return valid value (0 for invalid bitmap),
+ // so we don't needed check if bitmap is valid ;)
+ int uncheckedW = pItem->GetBitmap(false).GetWidth();
+ int checkedW = pItem->GetBitmap(true).GetWidth();
+
+ if ( m_maxBitmapWidth < uncheckedW )
+ {
+ m_maxBitmapWidth = uncheckedW;
+ updateAllMargins = true;
+ }
+
+ if ( m_maxBitmapWidth < checkedW )
+ {
+ m_maxBitmapWidth = checkedW;
+ updateAllMargins = true;
+ }
+
+ // make other item ownerdrawn and update margin width for equals alignment
+ if ( !m_ownerDrawn || updateAllMargins )
+ {
+ // we must use position in SetOwnerDrawnMenuItem because
+ // all separators have the same id
+ int pos = 0;
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem* item = node->GetData();
+
+ if ( !item->IsOwnerDrawn())
+ {
+ item->SetOwnerDrawn(true);
+ SetOwnerDrawnMenuItem(GetHmenu(), pos,
+ reinterpret_cast<ULONG_PTR>(item), TRUE);
+ }
+
+ item->SetMarginWidth(m_maxBitmapWidth);
+
+ node = node->GetNext();
+ pos++;
+ }
+
+ // set menu as ownerdrawn
+ m_ownerDrawn = true;
+
+ ResetMaxAccelWidth();
+ }
+ // only update our margin for equals alignment to other item
+ else if ( !updateAllMargins )
+ {
+ pItem->SetMarginWidth(m_maxBitmapWidth);
+ }
}
}
else
flags |= MF_STRING;
#ifdef __WXWINCE__
- itemText = wxMenuItem::GetLabelFromText(itemText);
+ itemText = wxMenuItem::GetLabelText(itemText);
#endif
- pData = (wxChar*)itemText.c_str();
+ pData = (wxChar*)itemText.wx_str();
}
// item might have already been inserted by InsertMenuItem() above
// if we just appended the title, highlight it
- if ( (int)id == idMenuTitle )
+ if ( id == (UINT_PTR)idMenuTitle )
{
// visually select the menu title
SetDefaultMenuItem(GetHmenu(), id);
wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
{
- wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
+ wxCHECK_MSG( item, NULL, wxT("NULL item in wxMenu::DoAppend") );
bool check = false;
}
else
{
- wxFAIL_MSG( _T("where is the radio group start item?") );
+ wxFAIL_MSG( wxT("where is the radio group start item?") );
}
}
}
delete m_accels[n];
m_accels.RemoveAt(n);
+
+ ResetMaxAccelWidth();
}
//else: this item doesn't have an accel, nothing to do
#endif // wxUSE_ACCEL
return count;
}
+wxAcceleratorTable *wxMenu::CreateAccelTable() const
+{
+ const size_t count = m_accels.size();
+ wxScopedArray<wxAcceleratorEntry> accels(new wxAcceleratorEntry[count]);
+ CopyAccels(accels.get());
+
+ return new wxAcceleratorTable(count, accels.get());
+}
+
#endif // wxUSE_ACCEL
+// ---------------------------------------------------------------------------
+// ownerdrawn helpers
+// ---------------------------------------------------------------------------
+
+#if wxUSE_OWNER_DRAWN
+
+void wxMenu::CalculateMaxAccelWidth()
+{
+ wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") );
+
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem* item = node->GetData();
+
+ if ( item->IsOwnerDrawn() )
+ {
+ int width = item->MeasureAccelWidth();
+ if (width > m_maxAccelWidth )
+ m_maxAccelWidth = width;
+ }
+
+ node = node->GetNext();
+ }
+}
+
+#endif // wxUSE_OWNER_DRAWN
+
// ---------------------------------------------------------------------------
// set wxMenu title
// ---------------------------------------------------------------------------
if ( !label.empty() )
{
if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
- (unsigned)idMenuTitle, m_title) ||
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) ||
!::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
{
wxLogLastError(wxT("InsertMenu"));
info.fMask = MIIM_TYPE;
info.fType = MFT_STRING;
info.cch = m_title.length();
- info.dwTypeData = (LPTSTR) m_title.c_str();
+ info.dwTypeData = const_cast<wxChar *>(m_title.wx_str());
if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
{
wxLogLastError(wxT("SetMenuItemInfo"));
#else
if ( !ModifyMenu(hMenu, 0u,
MF_BYPOSITION | MF_STRING,
- (unsigned)idMenuTitle, m_title) )
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) )
{
wxLogLastError(wxT("ModifyMenu"));
}
// put the title string in bold face
if ( !m_title.empty() )
{
- SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle);
+ SetDefaultMenuItem(GetHmenu(), (UINT_PTR)idMenuTitle);
}
#endif // Win32
}
// event processing
// ---------------------------------------------------------------------------
-bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
+bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)
{
+ const int id = (signed short)id_;
+
// ignore commands from the menu title
- if ( id != (WXWORD)idMenuTitle )
+ if ( id != idMenuTitle )
{
// update the check item when it's clicked
wxMenuItem * const item = FindItem(id);
if ( item && item->IsCheckable() )
item->Toggle();
- // get the checked status of the menu item: note that menuState is the
- // old state of the menu, so the test for MF_CHECKED must be inverted
+ // get the status of the menu item: note that it has been just changed
+ // by Toggle() above so here we already get the new state of the item
UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND);
- SendEvent(id, !(menuState & MF_CHECKED));
+ SendEvent(id, menuState & MF_CHECKED);
}
return true;
}
-// ---------------------------------------------------------------------------
-// other
-// ---------------------------------------------------------------------------
-
-wxWindow *wxMenu::GetWindow() const
-{
- if ( m_invokingWindow != NULL )
- return m_invokingWindow;
- else if ( GetMenuBar() != NULL)
- return GetMenuBar()->GetFrame();
-
- return NULL;
-}
-
// ---------------------------------------------------------------------------
// Menu Bar
// ---------------------------------------------------------------------------
if ( m_hMenu != 0 )
return m_hMenu;
- if (!GetToolBar())
- return 0;
+ wxToolMenuBar * const bar = static_cast<wxToolMenuBar *>(GetToolBar());
+ if ( !bar )
+ return NULL;
- HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
- HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0);
+ HWND hCommandBar = GetHwndOf(bar);
- // hMenu may be zero on Windows Mobile 5. So add the menus anyway.
- if (1) // (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;
+ // notify comctl32.dll about the version of the headers we use before using
+ // any other TB_XXX messages
+ SendMessage(hCommandBar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
- 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();
+ TBBUTTON tbButton;
+ wxZeroMemory(tbButton);
+ tbButton.iBitmap = I_IMAGENONE;
+ tbButton.fsState = TBSTATE_ENABLED;
+ tbButton.fsStyle = TBSTYLE_DROPDOWN |
+ TBSTYLE_NO_DROPDOWN_ARROW |
+ TBSTYLE_AUTOSIZE;
- int position = i;
+ for ( unsigned i = 0; i < GetMenuCount(); i++ )
+ {
+ HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu();
+ tbButton.dwData = (DWORD)hPopupMenu;
+ wxString label = wxStripMenuCodes(GetMenuLabel(i));
+ tbButton.iString = (int) label.wx_str();
- tbButton.idCommand = NewControlId();
- if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton))
- {
- wxLogLastError(wxT("TB_INSERTBUTTON"));
- }
+ tbButton.idCommand = NewControlId();
+ if ( !::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton) )
+ {
+ wxLogLastError(wxT("TB_INSERTBUTTON"));
}
}
- m_hMenu = (WXHMENU) hMenu;
+
+ m_hMenu = bar->GetHMenu();
return m_hMenu;
-#else
+#else // !__WXWINCE__
if ( m_hMenu != 0 )
return m_hMenu;
for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
{
if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
- (UINT)(*it)->GetHMenu(),
- m_titles[i]) )
+ (UINT_PTR)(*it)->GetHMenu(),
+ m_titles[i].wx_str()) )
{
wxLogLastError(wxT("AppendMenu"));
}
}
return m_hMenu;
-#endif
+#endif // __WXWINCE__/!__WXWINCE__
}
int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
Refresh();
}
-void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
+void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
{
wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
- UINT id;
+ UINT_PTR id;
UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
if ( flagsOld == 0xFFFFFFFF )
{
{
// HIBYTE contains the number of items in the submenu in this case
flagsOld &= 0xff;
- id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos);
+ id = (UINT_PTR)::GetSubMenu((HMENU)m_hMenu, mswpos);
}
else
{
info.fMask = MIIM_TYPE;
info.fType = MFT_STRING;
info.cch = label.length();
- info.dwTypeData = (LPTSTR) label.c_str();
- if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, & info) )
+ info.dwTypeData = const_cast<wxChar *>(label.wx_str());
+ if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, &info) )
{
wxLogLastError(wxT("SetMenuItemInfo"));
}
#else
if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
- id, label) == (int)0xFFFFFFFF )
+ id, label.wx_str()) == (int)0xFFFFFFFF )
{
wxLogLastError(wxT("ModifyMenu"));
}
Refresh();
}
-wxString wxMenuBar::GetLabelTop(size_t pos) const
+wxString wxMenuBar::GetMenuLabel(size_t pos) const
{
wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
- wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+ wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
- return wxMenuItem::GetLabelFromText(m_titles[pos]);
+ return m_titles[pos];
}
// ---------------------------------------------------------------------------
if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
MF_BYPOSITION | MF_POPUP | MF_STRING,
- (UINT)GetHmenuOf(menu), title) )
+ (UINT_PTR)GetHmenuOf(menu), title.wx_str()) )
{
wxLogLastError(wxT("InsertMenu"));
}
HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
tbButton.dwData = (DWORD)hPopupMenu;
wxString label = wxStripMenuCodes(title);
- tbButton.iString = (int) label.c_str();
+ tbButton.iString = (int) label.wx_str();
tbButton.idCommand = NewControlId();
if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
#else
if ( !::InsertMenu(GetHmenu(), mswpos,
MF_BYPOSITION | MF_POPUP | MF_STRING,
- (UINT)GetHmenuOf(menu), title) )
+ (UINT_PTR)GetHmenuOf(menu), title.wx_str()) )
{
wxLogLastError(wxT("InsertMenu"));
}
HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
tbButton.dwData = (DWORD)hPopupMenu;
wxString label = wxStripMenuCodes(title);
- tbButton.iString = (int) label.c_str();
+ tbButton.iString = (int) label.wx_str();
tbButton.idCommand = NewControlId();
if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
}
#else
if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
- (UINT)submenu, title) )
+ (UINT_PTR)submenu, title.wx_str()) )
{
wxLogLastError(wxT("AppendMenu"));
}
nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
}
- m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
+ SetAcceleratorTable(wxAcceleratorTable(nAccelCount, accelEntries));
delete [] accelEntries;
}
if (style & wxCLOSE_BOX)
{
if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0))
+ {
wxLogLastError(wxT("CommandBar_AddAdornments"));
+ }
else
+ {
return true;
+ }
}
return false;
}
projects / wxWidgets.git / blobdiff