X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 385c7fb320..4c4383e467 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" @@ -30,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" @@ -50,8 +48,7 @@ #include #include #include -#include -#if _WIN32_WCE < 400 +#if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__) #include #endif @@ -62,25 +59,53 @@ // other standard headers #include +//VC6 needs these defining, though they are in winuser.h +#ifndef MIIM_BITMAP +#define MIIM_STRING 0x00000040 +#define MIIM_BITMAP 0x00000080 +#define MIIM_FTYPE 0x00000100 +#define HBMMENU_CALLBACK ((HBITMAP) -1) +typedef struct tagMENUINFO +{ + DWORD cbSize; + DWORD fMask; + DWORD dwStyle; + UINT cyMax; + HBRUSH hbrBack; + DWORD dwContextHelpID; + DWORD dwMenuData; +} MENUINFO, FAR *LPMENUINFO; +#endif + +#if wxUSE_OWNER_DRAWN + #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 // ---------------------------------------------------------------------------- // the (popup) menu title has this special id -static const int idMenuTitle = -3; +static const UINT idMenuTitle = (UINT)-3; // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- // 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 +128,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 +139,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,7 +161,7 @@ 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 , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) @@ -170,7 +196,7 @@ 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 ) ; @@ -201,7 +227,7 @@ const wxMenuInfoList& wxMenuBar::GetMenuInfos() const for( size_t i = 0 ; i < GetMenuCount() ; ++i ) { wxMenuInfo* info = new wxMenuInfo() ; - info->Create( const_cast(this)->GetMenu(i) , GetLabelTop(i) ) ; + info->Create( const_cast(this)->GetMenu(i) , GetMenuLabel(i) ) ; list->Append( info ) ; } return m_menuInfos ; @@ -214,7 +240,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 +251,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 +281,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,8 +320,18 @@ 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()); + wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetItemLabel()); if ( accel ) accel->m_command = item->GetId(); @@ -342,7 +378,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() ) { @@ -363,60 +399,176 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) flags |= MF_POPUP; } else { - id = pItem->GetId(); + id = pItem->GetMSWId(); } -#ifdef __WXWINCE__ - wxString strippedString; -#endif - LPCTSTR pData; + // prepare to insert the item in the menu + wxString itemText = pItem->GetItemLabel(); + 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; #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; + // 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(); + } } - else #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 [checked] bitmap? + if ( (pItem->GetBitmap(false).Ok() || pItem->GetBitmap(true).Ok()) && + !pItem->GetTextColour().Ok() && + !pItem->GetBackgroundColour().Ok() && + !pItem->GetFont().Ok() ) + { + // try to use InsertMenuItem() as it's guaranteed to look correct + // while our owner-drawn code is not +#ifndef __DMC__ + // DMC at march 2007 doesn't have HBITMAP hbmpItem tagMENUITEMINFOA /W + // MIIM_BITMAP only works under WinME/2000+ + WinStruct mii; + 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.wx_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 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); + 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 // __DMC__ + } + + if ( !ok ) + { + // item draws itself, pass pointer to it in data parameter + flags |= MF_OWNERDRAW; + pData = (LPCTSTR)pItem; + } + } + 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__ - strippedString = wxStripMenuCodes(pItem->GetText()); - pData = (wxChar*)strippedString.c_str(); -#else - pData = (wxChar*)pItem->GetText().c_str(); + itemText = wxMenuItem::GetLabelText(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.wx_str(); } + // item might have already been 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 ) + if ( 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() && GetMenuBar()->IsAttached() ) @@ -424,7 +576,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) GetMenuBar()->Refresh(); } - return TRUE; + return true; } void wxMenu::EndRadioGroup() @@ -437,7 +589,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 +605,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 +636,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) if ( check ) { // check the item initially - item->Check(TRUE); + item->Check(true); } return item; @@ -500,7 +652,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++ ) @@ -511,7 +663,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 @@ -534,7 +686,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(); } @@ -548,7 +700,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 { @@ -569,17 +721,17 @@ 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) || + idMenuTitle, m_title.wx_str()) || !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) { wxLogLastError(wxT("InsertMenu")); @@ -588,7 +740,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,8 +758,8 @@ void wxMenu::SetTitle(const wxString& label) info.cbSize = sizeof(info); info.fMask = MIIM_TYPE; info.fType = MFT_STRING; - info.cch = m_title.Length(); - info.dwTypeData = (LPTSTR) m_title.c_str(); + info.cch = m_title.length(); + info.dwTypeData = wx_const_cast(wxChar *, m_title.wx_str()); if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) ) { wxLogLastError(wxT("SetMenuItemInfo")); @@ -615,7 +767,7 @@ void wxMenu::SetTitle(const wxString& label) #else if ( !ModifyMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) ) + idMenuTitle, m_title.wx_str()) ) { wxLogLastError(wxT("ModifyMenu")); } @@ -625,9 +777,9 @@ 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); + SetDefaultMenuItem(GetHmenu(), idMenuTitle); } #endif // Win32 } @@ -636,22 +788,25 @@ void wxMenu::SetTitle(const wxString& label) // event processing // --------------------------------------------------------------------------- -bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) +bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_) { - // ignore commands from the menu title + const int id = (signed short)id_; - // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!! - if ( id != (WXWORD)idMenuTitle ) + // ignore commands from the menu title + if ( id != 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) ; + // update the check item when it's clicked + wxMenuItem * const item = FindItem(id); + if ( item && item->IsCheckable() ) + item->Toggle(); + + // 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); } - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -676,14 +831,15 @@ void wxMenuBar::Init() { m_eventHandler = this; m_hMenu = 0; -#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) +#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 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)) +#if defined(WINCE_WITH_COMMANDBAR) m_commandBar = NULL; + m_adornmentsAdded = false; #endif } @@ -697,13 +853,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 +872,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 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) +#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 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)) +#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 @@ -741,14 +901,17 @@ wxMenuBar::~wxMenuBar() void wxMenuBar::Refresh() { + if ( IsFrozen() ) + return; + wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); -#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (GetToolBar()) { CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0); } -#elif defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)) +#elif defined(WINCE_WITH_COMMANDBAR) if (m_commandBar) DrawMenuBar((HWND) m_commandBar); #else @@ -758,47 +921,49 @@ 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. -#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) +#if defined(WINCE_WITHOUT_COMMANDBAR) if ( m_hMenu != 0 ) return m_hMenu; - if (!GetToolBar()) - return 0; + wxToolMenuBar * const bar = wx_static_cast(wxToolMenuBar *, GetToolBar()); + if ( !bar ) + return NULL; + + HWND hCommandBar = GetHwndOf(bar); - HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); - HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0); - if (hMenu) + // 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); + + TBBUTTON tbButton; + wxZeroMemory(tbButton); + tbButton.iBitmap = I_IMAGENONE; + tbButton.fsState = TBSTATE_ENABLED; + tbButton.fsStyle = TBSTYLE_DROPDOWN | + TBSTYLE_NO_DROPDOWN_ARROW | + TBSTYLE_AUTOSIZE; + + for ( unsigned i = 0; i < GetMenuCount(); i++ ) { - 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++) + 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, i, (LPARAM)&tbButton) ) { - HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu() ; - tbButton.dwData = (DWORD)hPopupMenu; - wxString label = wxStripMenuCodes(GetLabelTop(i)); - tbButton.iString = (int) label.c_str(); - - int position = i; - - tbButton.idCommand = NewControlId(); - if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton)) - { - wxLogLastError(wxT("TB_INSERTBUTTON")); - } + 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; @@ -816,7 +981,7 @@ WXHMENU wxMenuBar::Create() { if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)(*it)->GetHMenu(), - m_titles[i]) ) + m_titles[i].wx_str()) ) { wxLogLastError(wxT("AppendMenu")); } @@ -824,7 +989,7 @@ WXHMENU wxMenuBar::Create() } return m_hMenu; -#endif +#endif // __WXWINCE__/!__WXWINCE__ } int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos) @@ -873,7 +1038,7 @@ void wxMenuBar::EnableTop(size_t pos, bool enable) 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") ); @@ -913,16 +1078,16 @@ 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.dwTypeData = (LPTSTR) label.c_str(); + info.cch = label.length(); + info.dwTypeData = wx_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")); } @@ -931,12 +1096,12 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) 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]; } // --------------------------------------------------------------------------- @@ -951,7 +1116,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); @@ -963,7 +1132,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) if ( !::InsertMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION | MF_POPUP | MF_STRING, - (UINT)GetHmenuOf(menu), title) ) + (UINT)GetHmenuOf(menu), title.wx_str()) ) { wxLogLastError(wxT("InsertMenu")); } @@ -976,7 +1145,8 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } return menuOld; @@ -987,41 +1157,49 @@ 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 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) +#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.iString = (int) label.wx_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, - (UINT)GetHmenuOf(menu), title) ) + (UINT)GetHmenuOf(menu), title.wx_str()) ) { wxLogLastError(wxT("InsertMenu")); } @@ -1034,48 +1212,53 @@ 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 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) +#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.iString = (int) label.wx_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, - (UINT)submenu, title) ) + (UINT)submenu, title.wx_str()) ) { wxLogLastError(wxT("AppendMenu")); } @@ -1089,10 +1272,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 +1285,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 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)) +#if defined(WINCE_WITHOUT_COMMANDBAR) if (GetToolBar()) { if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0)) @@ -1126,10 +1314,10 @@ wxMenu *wxMenuBar::Remove(size_t pos) } #endif // wxUSE_ACCEL - Refresh(); + if (IsAttached()) + Refresh(); } - m_titles.RemoveAt(pos); return menu; @@ -1170,24 +1358,9 @@ void wxMenuBar::Attach(wxFrame *frame) { wxMenuBarBase::Attach(frame); -#if defined(__WXWINCE__) +#if defined(WINCE_WITH_COMMANDBAR) if (!m_hMenu) this->Create(); -#if _WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP) - - // No idea why this was here, but it seems to be obsolete. - // Remove after testing with other WinCE combinations - April 2004 -#if 0 - if (GetToolBar()) - { - HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); - if (!CommandBar_InsertMenubarEx(hCommandBar, NULL, (LPTSTR) m_hMenu, 0)) - { - wxLogLastError(wxT("CommandBar_InsertMenubarEx")); - } - } -#endif -#else if (!m_commandBar) m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId()); if (m_commandBar) @@ -1201,15 +1374,29 @@ void wxMenuBar::Attach(wxFrame *frame) } } #endif - // PSPC/WFSP -#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();