X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61243a510fe15e04996a986daaa53ed9fee75484..6f36917bbffe00404ae6f653e876d57efc25a8ac:/src/os2/menu.cpp?ds=sidebyside diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp index 023870332c..971cff759b 100644 --- a/src/os2/menu.cpp +++ b/src/os2/menu.cpp @@ -17,6 +17,7 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP + #include "wx/app.h" #include "wx/frame.h" #include "wx/menu.h" #include "wx/utils.h" @@ -48,6 +49,15 @@ extern wxMenu* wxCurrentPopupMenu; // static const int idMenuTitle = -2; +// +// The unique ID for Menus +// +#ifdef __VISAGECPP__ +USHORT wxMenu::m_nextMenuId = 0; +#else +static USHORT wxMenu::m_nextMenuId = 0; +#endif + // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -55,6 +65,40 @@ static const int idMenuTitle = -2; IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) +// ---------------------------------------------------------------------------- +// static function for translating menu labels +// ---------------------------------------------------------------------------- + +static wxString TextToLabel(const wxString& rTitle) +{ + wxString Title; + const wxChar *pc; + for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ ) + { + if (*pc == wxT('&') ) + { + if (*(pc+1) == wxT('&')) + { + pc++; + Title << wxT('&'); + } + else + Title << wxT('~'); + } + else + { + if ( *pc == wxT('~') ) + { + // tildes must be doubled to prevent them from being + // interpreted as accelerator character prefix by PM ??? + Title << *pc; + } + Title << *pc; + } + } + return Title; +} + // ============================================================================ // implementation // ============================================================================ @@ -71,28 +115,36 @@ void wxMenu::Init() m_bDoBreak = FALSE; // - // Create the menu + // Create the menu (to be used as a submenu or a popup) // - m_hMenu = ::WinCreateWindow( HWND_DESKTOP // parent - ,WC_MENU // type - ,"Menu" // a generic name - ,0L // no style flag - ,0L,0L,0L,0L // no position - ,NULLHANDLE // no owner - ,NULLHANDLE // no insertion position - ,0L // no ID needed for dynamic creation - ,NULL // no control data - ,NULL // no presentation params - ); - if (!m_hMenu) + if ((m_hMenu = ::WinCreateWindow( HWND_DESKTOP + ,WC_MENU + ,"Menu" + ,0L + ,0L + ,0L + ,0L + ,0L + ,NULLHANDLE + ,HWND_TOP + ,0L + ,NULL + ,NULL + )) == 0) { wxLogLastError("WinLoadMenu"); } + m_vMenuData.iPosition = 0; + m_vMenuData.afStyle = MIS_SUBMENU | MIS_TEXT; + m_vMenuData.afAttribute = (USHORT)0; + m_vMenuData.id = m_nextMenuId++; + m_vMenuData.hwndSubMenu = m_hMenu; + m_vMenuData.hItem = NULLHANDLE; // // If we have a title, insert it in the beginning of the menu // - if (!!m_title) + if (!m_title.IsEmpty()) { Append( idMenuTitle ,m_title @@ -122,7 +174,9 @@ wxMenu::~wxMenu() // // Delete accels // +#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) WX_CLEAR_ARRAY(m_vAccels); +#endif #endif // wxUSE_ACCEL } // end of wxMenu::~wxMenu @@ -186,7 +240,7 @@ void wxMenu::UpdateAccel( if (pAccel) m_vAccels[n] = pAccel; else - m_vAccels.Remove(n); + m_vAccels.RemoveAt(n); } if (IsAttached()) @@ -205,44 +259,60 @@ bool wxMenu::DoInsertOrAppend( , size_t nPos ) { + ERRORID vError; + wxString sError; + char zMsg[128]; #if wxUSE_ACCEL UpdateAccel(pItem); #endif // wxUSE_ACCEL + // + // rItem is the member MENUITEM for the menu items and the submenu's + // MENUITEM for submenus as required by ::MM_INSERTITEM message API + // + + wxMenu* pSubmenu = pItem->GetSubMenu(); + MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData: + pItem->m_vMenuData; + if(pSubmenu != NULL) + { + wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu")); + pSubmenu->SetParent(this); + rItem.afStyle |= MIS_SUBMENU | MIS_TEXT; + } + // // If "Break" has just been called, insert a menu break before this item // (and don't forget to reset the flag) // if (m_bDoBreak) { - m_vMenuData.afStyle |= MIS_BREAK; + rItem.afStyle |= MIS_BREAK; m_bDoBreak = FALSE; } if (pItem->IsSeparator()) { - m_vMenuData.afStyle |= MIS_SEPARATOR; + rItem.afStyle |= MIS_SEPARATOR; } // // Id is the numeric id for normal menu items and HMENU for submenus as - // required by ::WinInsertMenu() API + // required by ::MM_INSERTITEM message API // - wxMenu* pSubmenu = pItem->GetSubMenu(); - MENUITEM vItem; - - if (pSubmenu != NULL ) + if (pSubmenu != NULL) { wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu")); pSubmenu->SetParent(this); - m_vMenuData.id = (USHORT)pSubmenu->GetHMenu(); - m_vMenuData.afStyle |= MIS_SUBMENU; + rItem.iPosition = 0; // submenus have a 0 position + rItem.id = (USHORT)pSubmenu->GetHMenu(); + rItem.afStyle |= MIS_SUBMENU | MIS_TEXT; } else { - m_vMenuData.id = pItem->GetId(); + rItem.id = pItem->GetId(); } BYTE* pData; @@ -252,10 +322,14 @@ bool wxMenu::DoInsertOrAppend( { // // Want to get {Measure|Draw}Item messages? - // item draws itself, pass pointer to it in data parameter + // item draws itself, passing pointer to data doesn't work in OS/2 + // Will eventually need to set the image handle somewhere into vItem.hItem // - m_vMenuData.afStyle |= MIS_OWNERDRAW; - pData = (BYTE*)pItem; + rItem.afStyle |= MIS_OWNERDRAW; + pData = (BYTE*)NULL; + rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP(); + pItem->m_vMenuData.afStyle = rItem.afStyle; + pItem->m_vMenuData.hItem = rItem.hItem; } else #endif @@ -263,45 +337,46 @@ bool wxMenu::DoInsertOrAppend( // // Menu is just a normal string (passed in data parameter) // - m_vMenuData.afStyle |= MIS_TEXT; + rItem.afStyle |= MIS_TEXT; pData = (char*)pItem->GetText().c_str(); } - BOOL bOk; - - // - // -1 means this is a sub menu not a menuitem - // if (nPos == (size_t)-1) { - HWND hSubMenu = ::WinCreateWindow( HWND_DESKTOP // parent - ,WC_MENU // type - ,"Menu" // a generic name - ,0L // no style flag - ,0L,0L,0L,0L // no position - ,NULLHANDLE // no owner - ,NULLHANDLE // no insertion position - ,0L // no ID needed for dynamic creation - ,NULL // no control data - ,NULL // no presentation params - ); - - m_vMenuData.iPosition = 0; - m_vMenuData.hwndSubMenu = hSubMenu; - m_vMenuData.hItem = NULLHANDLE; - - bOk = (bool)::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&vItem, (MPARAM)NULL); + rItem.iPosition = MIT_END; } else { - m_vMenuData.iPosition = nPos; - m_vMenuData.hwndSubMenu = NULLHANDLE; - m_vMenuData.hItem = NULLHANDLE; - bOk = (bool)::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&vItem, (MPARAM)pData); + rItem.iPosition = nPos; } - if (!bOk) + APIRET rc; + + rc = (APIRET)::WinSendMsg( GetHmenu() + ,MM_INSERTITEM + ,(MPARAM)&rItem + ,(MPARAM)pData + ); +#if wxUSE_OWNER_DRAWN + if (pItem->IsOwnerDrawn()) { + BOOL rc; + MENUITEM vMenuItem; + + ::WinSendMsg( GetHmenu() + ,MM_QUERYITEM + ,MPFROM2SHORT( (USHORT)pItem->GetId() + ,(USHORT)(FALSE) + ) + ,&vMenuItem + ); + } +#endif + if (rc == MIT_MEMERROR || rc == MIT_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError); wxLogLastError("Insert or AppendMenu"); return FALSE; } @@ -310,7 +385,7 @@ bool wxMenu::DoInsertOrAppend( // // If we're already attached to the menubar, we must update it // - if (IsAttached()) + if (IsAttached() && m_menuBar->IsAttached()) { m_menuBar->Refresh(); } @@ -369,7 +444,7 @@ wxMenuItem* wxMenu::DoRemove( if (n != wxNOT_FOUND) { delete m_vAccels[n]; - m_vAccels.Remove(n); + m_vAccels.RemoveAt(n); } #endif // wxUSE_ACCEL @@ -381,7 +456,7 @@ wxMenuItem* wxMenu::DoRemove( ,MPFROM2SHORT(pItem->GetId(), TRUE) ,(MPARAM)0 ); - if (IsAttached()) + if (IsAttached() && m_menuBar->IsAttached()) { // // Otherwise, the chane won't be visible @@ -480,73 +555,21 @@ bool wxMenu::OS2Command( if (vId != (WXWORD)idMenuTitle) { - wxCommandEvent vEvent(wxEVT_COMMAND_MENU_SELECTED); - - vEvent.SetEventObject(this); - vEvent.SetId(vId); - vEvent.SetInt(vId); - ProcessCommand(vEvent); + SendEvent( vId + ,(int)::WinSendMsg( GetHmenu() + ,MM_QUERYITEMATTR + ,(MPARAM)vId + ,(MPARAM)MIA_CHECKED + ) + ); } return TRUE; } // end of wxMenu::OS2Command -bool wxMenu::ProcessCommand( - wxCommandEvent& rEvent -) -{ - bool bProcessed = FALSE; - -#if wxUSE_MENU_CALLBACK - // - // Try a callback - // - if (m_callback) - { - (void)(*(m_callback))(*this, rEvent); - bProcessed = TRUE; - } -#endif // wxUSE_MENU_CALLBACK - - // - // Try the menu's event handler - // - if (!bProcessed && GetEventHandler()) - { - bProcessed = GetEventHandler()->ProcessEvent(rEvent); - } - - // - // Try the window the menu was popped up from (and up through the - // hierarchy) - wxWindow* pWin = GetInvokingWindow(); - - if (!bProcessed && pWin) - bProcessed = pWin->GetEventHandler()->ProcessEvent(rEvent); - return bProcessed; -} // end of wxMenu::ProcessCommand - // --------------------------------------------------------------------------- // other // --------------------------------------------------------------------------- -void wxMenu::Attach( - wxMenuBar* pMenubar -) -{ - // - // Menu can be in at most one menubar because otherwise they would both - // delete the menu pointer - // - wxASSERT_MSG(!m_menuBar, wxT("menu belongs to 2 menubars, expect a crash")); - m_menuBar = pMenubar; -} // end of - -void wxMenu::Detach() -{ - wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") ); - m_menuBar = NULL; -} // end of wxMenu::Detach - wxWindow* wxMenu::GetWindow() const { if (m_invokingWindow != NULL) @@ -557,6 +580,47 @@ wxWindow* wxMenu::GetWindow() const return NULL; } // end of wxMenu::GetWindow +// recursive search for item by id +wxMenuItem* wxMenu::FindItem( + int nItemId +, ULONG hItem +, wxMenu** ppItemMenu +) const +{ + if ( ppItemMenu ) + *ppItemMenu = NULL; + + wxMenuItem* pItem = NULL; + + for ( wxMenuItemList::Node *node = m_items.GetFirst(); + node && !pItem; + node = node->GetNext() ) + { + pItem = node->GetData(); + + if ( pItem->GetId() == nItemId && pItem->m_vMenuData.hItem == hItem) + { + if ( ppItemMenu ) + *ppItemMenu = (wxMenu *)this; + } + else if ( pItem->IsSubMenu() ) + { + pItem = pItem->GetSubMenu()->FindItem( nItemId + ,hItem + ,ppItemMenu + ); + if (pItem) + break; + } + else + { + // don't exit the loop + pItem = NULL; + } + } + return pItem; +} // end of wxMenu::FindItem + // --------------------------------------------------------------------------- // Menu Bar // --------------------------------------------------------------------------- @@ -609,35 +673,45 @@ void wxMenuBar::Refresh() { wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") ); -// DrawMenuBar(GetHwndOf(m_menuBarFrame)); -} + WinSendMsg(GetWinHwnd(m_pMenuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); +} // end of wxMenuBar::Refresh WXHMENU wxMenuBar::Create() { MENUITEM vItem; + HWND hFrame; if (m_hMenu != 0 ) return m_hMenu; wxCHECK_MSG(!m_hMenu, TRUE, wxT("menubar already created")); + // + // Menubars should be associated with a frame otherwise they are popups + // + if (m_pMenuBarFrame != NULL) + hFrame = GetWinHwnd(m_pMenuBarFrame); + else + hFrame = HWND_DESKTOP; // // Create an empty menu and then fill it with insertions // - m_hMenu = ::WinCreateWindow( HWND_DESKTOP // parent - ,WC_MENU // type - ,"Menu" // a generic name - ,0L // no style flag - ,0L,0L,0L,0L // no position - ,NULLHANDLE // no owner - ,NULLHANDLE // no insertion position - ,0L // no ID needed for dynamic creation - ,NULL // no control data - ,NULL // no presentation params - ); - if (!m_hMenu) - { - wxLogLastError("CreateMenu"); + if ((m_hMenu = ::WinCreateWindow( hFrame + ,WC_MENU + ,(PSZ)NULL + ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE + ,0L + ,0L + ,0L + ,0L + ,hFrame + ,HWND_TOP + ,FID_MENU + ,NULL + ,NULL + )) == 0) + { + wxLogLastError("WinLoadMenu"); } else { @@ -645,14 +719,41 @@ WXHMENU wxMenuBar::Create() for (size_t i = 0; i < nCount; i++) { - vItem.iPosition = 0; - vItem.afStyle = MIS_SUBMENU | MIS_TEXT; - vItem.afAttribute = (USHORT)0; - vItem.id = (USHORT)0; - vItem.hwndSubMenu = m_menus[i]->GetHMenu(); - vItem.hItem = NULLHANDLE; - - ::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&vItem, (MPARAM)m_titles[i].c_str()); + APIRET rc; + ERRORID vError; + wxString sError; + HWND hSubMenu; + + // + // Set the parent and owner of the submenues to be the menubar, not the desktop + // + hSubMenu = m_menus[i]->m_vMenuData.hwndSubMenu; + if (!::WinSetParent(m_menus[i]->m_vMenuData.hwndSubMenu, m_hMenu, FALSE)) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error setting parent for submenu. Error: %s\n", sError); + return NULLHANDLE; + } + + if (!::WinSetOwner(m_menus[i]->m_vMenuData.hwndSubMenu, m_hMenu)) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error setting parent for submenu. Error: %s\n", sError); + return NULLHANDLE; + } + + m_menus[i]->m_vMenuData.iPosition = i; + + rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&m_menus[i]->m_vMenuData, (MPARAM)m_titles[i].c_str()); + if (rc == MIT_MEMERROR || rc == MIT_ERROR) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError); + return NULLHANDLE; + } } } return m_hMenu; @@ -684,7 +785,7 @@ void wxMenuBar::EnableTop( wxLogLastError("LogLastError"); return; } - ::WinSendMsg((HWND)m_hMenu, MM_SETITEMATTR, MPFROM2SHORT(nId, TRUE), MPFROM2SHORT(uFlag, uFlag)); + ::WinSendMsg((HWND)m_hMenu, MM_SETITEMATTR, MPFROM2SHORT(nId, TRUE), MPFROM2SHORT(MIA_DISABLED, uFlag)); Refresh(); } // end of wxMenuBar::EnableTop @@ -747,9 +848,10 @@ wxMenu* wxMenuBar::Replace( ) { SHORT nId; + wxString Title = TextToLabel(rTitle); wxMenu* pMenuOld = wxMenuBarBase::Replace( nPos ,pMenu - ,rTitle + ,Title ); @@ -761,11 +863,11 @@ wxMenu* wxMenuBar::Replace( } if (!pMenuOld) return FALSE; - m_titles[nPos] = rTitle; + m_titles[nPos] = Title; if (IsAttached()) { - ::WinSendMsg((HWND)m_hMenu, MM_DELETEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); - ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)rTitle.c_str()); + ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); + ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str()); #if wxUSE_ACCEL if (pMenuOld->HasAccels() || pMenu->HasAccels()) @@ -787,13 +889,14 @@ bool wxMenuBar::Insert( , const wxString& rTitle ) { + wxString Title = TextToLabel(rTitle); if (!wxMenuBarBase::Insert( nPos ,pMenu - ,rTitle + ,Title )) return FALSE; - m_titles.Insert( rTitle + m_titles.Insert( Title ,nPos ); @@ -801,7 +904,7 @@ bool wxMenuBar::Insert( if (IsAttached()) { - ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)rTitle.c_str()); + ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str()); #if wxUSE_ACCEL if (pMenu->HasAccels()) { @@ -823,16 +926,16 @@ bool wxMenuBar::Append( wxCHECK_MSG(hSubmenu, FALSE, wxT("can't append invalid menu to menubar")); - if (!wxMenuBarBase::Append(pMenu, rTitle)) + wxString Title = TextToLabel(rTitle); + if (!wxMenuBarBase::Append(pMenu, Title)) return FALSE; - pMenu->Attach(this); - m_titles.Add(rTitle); + m_titles.Add(Title); if ( IsAttached() ) { pMenu->m_vMenuData.iPosition = MIT_END; - ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)rTitle.c_str()); + ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str()); #if wxUSE_ACCEL if (pMenu->HasAccels()) { @@ -865,7 +968,7 @@ wxMenu* wxMenuBar::Remove( } if (IsAttached()) { - ::WinSendMsg((HWND)GetHmenu(), MM_DELETEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); + ::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); pMenu->Detach(); #if wxUSE_ACCEL @@ -926,6 +1029,14 @@ void wxMenuBar::Attach( #if wxUSE_ACCEL RebuildAccelTable(); + // + // Ensure the accelerator table is set to the frame (not the client!) + // + if (!::WinSetAccelTable( vHabmain + ,(HWND)pFrame->GetHWND() + ,m_vAccelTable.GetHACCEL() + )) + wxLogLastError("WinSetAccelTable"); #endif // wxUSE_ACCEL } // end of wxMenuBar::Attach @@ -981,3 +1092,25 @@ wxMenuItem* wxMenuBar::FindItem( return pItem; } // end of wxMenuBar::FindItem +wxMenuItem* wxMenuBar::FindItem( + int nId +, ULONG hItem +, wxMenu** ppItemMenu +) const +{ + if (ppItemMenu) + *ppItemMenu = NULL; + + wxMenuItem* pItem = NULL; + size_t nCount = GetMenuCount(); + + for (size_t i = 0; !pItem && (i < nCount); i++) + { + pItem = m_menus[i]->FindItem( nId + ,hItem + ,ppItemMenu + ); + } + return pItem; +} // end of wxMenuBar::FindItem +