{
wxString Title;
const wxChar *pc;
- for (pc = rTitle; *pc != wxT('\0'); pc++ )
+ for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ )
{
if (*pc == wxT('&') )
{
else
Title << wxT('~');
}
-// else if (*pc == wxT('/'))
-// {
-// Title << wxT('\\');
-// }
else
{
if ( *pc == wxT('~') )
if (pAccel)
m_vAccels[n] = pAccel;
else
- m_vAccels.Remove(n);
+ m_vAccels.RemoveAt(n);
}
if (IsAttached())
{
ERRORID vError;
wxString sError;
+ char zMsg[128];
#if wxUSE_ACCEL
UpdateAccel(pItem);
#endif // wxUSE_ACCEL
{
//
// 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
//
rItem.afStyle |= MIS_OWNERDRAW;
- pData = (BYTE*)pItem;
- // vItem.hItem = ????
+ pData = (BYTE*)NULL;
+ rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP();
+ pItem->m_vMenuData.afStyle = rItem.afStyle;
+ pItem->m_vMenuData.hItem = rItem.hItem;
}
else
#endif
,(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);
//
// If we're already attached to the menubar, we must update it
//
- if (IsAttached())
+ if (IsAttached() && m_menuBar->IsAttached())
{
m_menuBar->Refresh();
}
if (n != wxNOT_FOUND)
{
delete m_vAccels[n];
- m_vAccels.Remove(n);
+ m_vAccels.RemoveAt(n);
}
#endif // wxUSE_ACCEL
,MPFROM2SHORT(pItem->GetId(), TRUE)
,(MPARAM)0
);
- if (IsAttached())
+ if (IsAttached() && m_menuBar->IsAttached())
{
//
// Otherwise, the chane won't be visible
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)
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
// ---------------------------------------------------------------------------
void wxMenuBar::Init()
{
m_eventHandler = this;
- m_pMenuBarFrame = NULL;
+ m_menuBarFrame = NULL;
m_hMenu = 0;
} // end of wxMenuBar::Init
{
wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
- WinSendMsg(GetWinHwnd(m_pMenuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ WinSendMsg(GetWinHwnd(m_menuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
} // end of wxMenuBar::Refresh
WXHMENU wxMenuBar::Create()
//
// Menubars should be associated with a frame otherwise they are popups
//
- if (m_pMenuBarFrame != NULL)
- hFrame = GetWinHwnd(m_pMenuBarFrame);
+ if (m_menuBarFrame != NULL)
+ hFrame = GetWinHwnd(m_menuBarFrame);
else
hFrame = HWND_DESKTOP;
//
,nPos
);
- pMenu->Attach(this);
-
if (IsAttached())
{
::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());
if (!wxMenuBarBase::Append(pMenu, Title))
return FALSE;
- pMenu->Attach(this);
m_titles.Add(Title);
if ( IsAttached() )
if (IsAttached())
{
::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
- pMenu->Detach();
#if wxUSE_ACCEL
if (pMenu->HasAccels())
)
{
wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
- m_pMenuBarFrame = pFrame;
#if wxUSE_ACCEL
RebuildAccelTable();
// Ensure the accelerator table is set to the frame (not the client!)
//
if (!::WinSetAccelTable( vHabmain
- ,(HWND)pFrame->GetFrame()
+ ,(HWND)pFrame->GetHWND()
,m_vAccelTable.GetHACCEL()
))
wxLogLastError("WinSetAccelTable");
{
::WinDestroyWindow((HWND)m_hMenu);
m_hMenu = (WXHMENU)NULL;
- m_pMenuBarFrame = NULL;
+ m_menuBarFrame = NULL;
} // end of wxMenuBar::Detach
// ---------------------------------------------------------------------------
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
projects / wxWidgets.git / blobdiff