X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eae4425db65fd3399aecdc70a8a05cc4f82d1eec..c5fc899bf29ca7d9c4e2a070e28228b430a68dd3:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index cf6c36043a..151427eca6 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -51,12 +51,12 @@ #include #include #include +#if _WIN32_WCE < 400 #include - -#ifndef TBSTYLE_NO_DROPDOWN_ARROW -#define TBSTYLE_NO_DROPDOWN_ARROW 0x0080 #endif +#include "wx/msw/wince/missing.h" + #endif // other standard headers @@ -73,7 +73,7 @@ extern wxMenu *wxCurrentPopupMenu; // ---------------------------------------------------------------------------- // the (popup) menu title has this special id -static const int idMenuTitle = -2; +static const int idMenuTitle = -3; // ---------------------------------------------------------------------------- // private functions @@ -321,7 +321,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item) if ( IsAttached() ) { - m_menuBar->RebuildAccelTable(); + GetMenuBar()->RebuildAccelTable(); } } //else: it is a separator, they can't have accels, nothing to do @@ -419,9 +419,9 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) #endif // __WIN32__ // if we're already attached to the menubar, we must update it - if ( IsAttached() && m_menuBar->IsAttached() ) + if ( IsAttached() && GetMenuBar()->IsAttached() ) { - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } return TRUE; @@ -433,9 +433,9 @@ void wxMenu::EndRadioGroup() m_startRadioGroup = -1; } -bool wxMenu::DoAppend(wxMenuItem *item) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) { - wxCHECK_MSG( item, FALSE, _T("NULL item in wxMenu::DoAppend") ); + wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") ); bool check = FALSE; @@ -478,7 +478,7 @@ bool wxMenu::DoAppend(wxMenuItem *item) if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) ) { - return FALSE; + return NULL; } if ( check ) @@ -487,12 +487,15 @@ bool wxMenu::DoAppend(wxMenuItem *item) item->Check(TRUE); } - return TRUE; + return item; } -bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - return wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos); + if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos)) + return item; + else + return NULL; } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -529,10 +532,10 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) wxLogLastError(wxT("RemoveMenu")); } - if ( IsAttached() && m_menuBar->IsAttached() ) + if ( IsAttached() && GetMenuBar()->IsAttached() ) { // otherwise, the chane won't be visible - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } // and from internal data structures @@ -659,8 +662,8 @@ wxWindow *wxMenu::GetWindow() const { if ( m_invokingWindow != NULL ) return m_invokingWindow; - else if ( m_menuBar != NULL) - return m_menuBar->GetFrame(); + else if ( GetMenuBar() != NULL) + return GetMenuBar()->GetFrame(); return NULL; } @@ -673,8 +676,14 @@ void wxMenuBar::Init() { m_eventHandler = this; m_hMenu = 0; -#ifdef __WXWINCE__ +#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) 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 && !wxUSE_POCKETPC_UI) + m_commandBar = NULL; #endif } @@ -705,9 +714,9 @@ wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) wxMenuBar::~wxMenuBar() { - // In Windows CE, the menubar is always associated + // In Windows CE (not .NET), the menubar is always associated // with a toolbar, which destroys the menu implicitly. -#ifdef __WXWINCE__ +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) if (GetToolBar()) GetToolBar()->SetMenuBar(NULL); #else @@ -715,7 +724,12 @@ wxMenuBar::~wxMenuBar() // which happens if we're attached to a frame if (m_hMenu && !IsAttached()) { +#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) + ::DestroyWindow((HWND) m_commandBar); + m_commandBar = (WXHWND) NULL; +#else ::DestroyMenu((HMENU)m_hMenu); +#endif m_hMenu = (WXHMENU)NULL; } #endif @@ -729,11 +743,14 @@ void wxMenuBar::Refresh() { wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); -#ifdef __WXWINCE__ +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) if (GetToolBar()) { CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0); } +#elif defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI) + if (m_commandBar) + DrawMenuBar((HWND) m_commandBar); #else DrawMenuBar(GetHwndOf(GetFrame())); #endif @@ -745,7 +762,7 @@ WXHMENU wxMenuBar::Create() // 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. -#ifdef __WXWINCE__ +#if defined(__WXWINCE__) && _WIN32_WCE < 400 if ( m_hMenu != 0 ) return m_hMenu; @@ -810,6 +827,33 @@ WXHMENU wxMenuBar::Create() #endif } +int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos) +{ + wxASSERT(menu); + wxASSERT(menu->GetHMenu()); + wxASSERT(m_hMenu); + +#if defined(__WXWINCE__) + int totalMSWItems = GetMenuCount(); +#else + int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu); +#endif + + int i; // For old C++ compatibility + for(i=wxpos; iGetHMenu()) + return i; + } + for(i=0; iGetHMenu()) + return i; + } + wxFAIL; + return -1; +} + // --------------------------------------------------------------------------- // wxMenuBar functions to work with the top level submenus // --------------------------------------------------------------------------- @@ -820,10 +864,11 @@ WXHMENU wxMenuBar::Create() void wxMenuBar::EnableTop(size_t pos, bool enable) { wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") ); + wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); int flag = enable ? MF_ENABLED : MF_GRAYED; - EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag); + EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag); Refresh(); } @@ -840,8 +885,10 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) } //else: have to modify the existing menu + int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos); + UINT id; - UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION); + UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION); if ( flagsOld == 0xFFFFFFFF ) { wxLogLastError(wxT("GetMenuState")); @@ -853,7 +900,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) { // HIBYTE contains the number of items in the submenu in this case flagsOld &= 0xff; - id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos); + id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos); } else { @@ -874,7 +921,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) } #else - if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld, + if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld, id, label) == (int)0xFFFFFFFF ) { wxLogLastError(wxT("ModifyMenu")); @@ -906,13 +953,15 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) if ( IsAttached() ) { + int mswpos = MSWPositionForWxMenu(menuOld,pos); + // can't use ModifyMenu() because it deletes the submenu it replaces - if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) ) { wxLogLastError(wxT("RemoveMenu")); } - if ( !::InsertMenu(GetHmenu(), (UINT)pos, + if ( !::InsertMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT)GetHmenuOf(menu), title) ) { @@ -935,6 +984,13 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) 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())) + ? -1 // append the menu + : MSWPositionForWxMenu(GetMenu(pos),pos); + if ( !wxMenuBarBase::Insert(pos, menu, title) ) return FALSE; @@ -942,7 +998,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) if ( IsAttached() ) { -#ifdef __WXWINCE__ +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) if (!GetToolBar()) return FALSE; TBBUTTON tbButton; @@ -963,7 +1019,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) return FALSE; } #else - if ( !::InsertMenu(GetHmenu(), pos, + if ( !::InsertMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT)GetHmenuOf(menu), title) ) { @@ -996,7 +1052,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title) if ( IsAttached() ) { -#ifdef __WXWINCE__ +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) if (!GetToolBar()) return FALSE; TBBUTTON tbButton; @@ -1047,7 +1103,7 @@ wxMenu *wxMenuBar::Remove(size_t pos) if ( IsAttached() ) { -#ifdef __WXWINCE__ +#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || wxUSE_POCKETPC_UI) if (GetToolBar()) { if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_DELETEBUTTON, (UINT) pos, (LPARAM) 0)) @@ -1056,11 +1112,12 @@ wxMenu *wxMenuBar::Remove(size_t pos) } } #else - if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) ) + if ( !::RemoveMenu(GetHmenu(), (UINT)MSWPositionForWxMenu(menu,pos), MF_BYPOSITION) ) { wxLogLastError(wxT("RemoveMenu")); } #endif + #if wxUSE_ACCEL if ( menu->HasAccels() ) { @@ -1072,6 +1129,7 @@ wxMenu *wxMenuBar::Remove(size_t pos) Refresh(); } + m_titles.RemoveAt(pos); return menu; @@ -1112,6 +1170,36 @@ void wxMenuBar::Attach(wxFrame *frame) { wxMenuBarBase::Attach(frame); +#if defined(__WXWINCE__) && _WIN32_WCE >= 400 + if (!m_hMenu) + this->Create(); +#if wxUSE_POCKETPC_UI + if (GetToolBar()) + { + HWND hCommandBar = (HWND) GetToolBar()->GetHWND(); + if (!CommandBar_InsertMenubarEx(hCommandBar, NULL, (LPTSTR) m_hMenu, 0)) + { + wxLogLastError(wxT("CommandBar_InsertMenubarEx")); + } + } +#else + if (!m_commandBar) + m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId()); + if (m_commandBar) + { + if (m_hMenu) + { + if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, (LPTSTR) m_hMenu, 0)) + { + wxLogLastError(wxT("CommandBar_InsertMenubarEx")); + } + } + } +#endif + // wxUSE_POCKETPC_UI +#endif + // __WXWINCE__ && _WIN32_WCE >= 400 + #if wxUSE_ACCEL RebuildAccelTable(); #endif // wxUSE_ACCEL