#include "wx/wxprec.h"
#ifndef WX_PRECOMP
+ #include "wx/app.h"
#include "wx/frame.h"
#include "wx/menu.h"
#include "wx/utils.h"
//
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
// ----------------------------------------------------------------------------
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; *pc != wxT('\0'); pc++ )
+ {
+ if (*pc == wxT('&') )
+ {
+ if (*(pc+1) == wxT('&'))
+ {
+ pc++;
+ Title << wxT('&');
+ }
+ else
+ Title << wxT('~');
+ }
+// else if (*pc == wxT('/'))
+// {
+// 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
// ============================================================================
// Create the menu (to be used as a submenu or a popup)
//
if ((m_hMenu = ::WinCreateWindow( HWND_DESKTOP
- ,(const wxChar*)WC_MENU
+ ,WC_MENU
,"Menu"
,0L
,0L
m_vMenuData.iPosition = 0;
m_vMenuData.afStyle = MIS_SUBMENU | MIS_TEXT;
m_vMenuData.afAttribute = (USHORT)0;
- m_vMenuData.id = (USHORT)0;
+ m_vMenuData.id = m_nextMenuId++;
m_vMenuData.hwndSubMenu = m_hMenu;
m_vMenuData.hItem = NULLHANDLE;
//
// Delete accels
//
+#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))
WX_CLEAR_ARRAY(m_vAccels);
+#endif
#endif // wxUSE_ACCEL
} // end of wxMenu::~wxMenu
{
ERRORID vError;
wxString sError;
-
#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;
+ vItem.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();
wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
pSubmenu->SetParent(this);
- m_vMenuData.iPosition = 0; // submenus have a 0 position
- m_vMenuData.id = (USHORT)pSubmenu->GetHMenu();
- m_vMenuData.afStyle |= MIS_SUBMENU;
+ vItem.iPosition = 0; // submenus have a 0 position
+ vItem.id = (USHORT)pSubmenu->GetHMenu();
+ vItem.afStyle |= MIS_SUBMENU | MIS_TEXT;
}
else
{
- m_vMenuData.id = pItem->GetId();
+ vItem.id = pItem->GetId();
}
BYTE* pData;
//
// Want to get {Measure|Draw}Item messages?
// item draws itself, pass pointer to it in data parameter
- // Will eventually need to set the image handle somewhere into m_vMenuData.hItem
+ // Will eventually need to set the image handle somewhere into vItem.hItem
//
- m_vMenuData.afStyle |= MIS_OWNERDRAW;
+ rItem.afStyle |= MIS_OWNERDRAW;
pData = (BYTE*)pItem;
+ // vItem.hItem = ????
}
else
#endif
//
// Menu is just a normal string (passed in data parameter)
//
- m_vMenuData.afStyle |= MIS_TEXT;
+ vItem.afStyle |= MIS_TEXT;
pData = (char*)pItem->GetText().c_str();
}
- APIRET rc;
-
- m_vMenuData.hwndSubMenu = NULLHANDLE;
- m_vMenuData.hItem = NULLHANDLE;
-
- //
- // -1 means append at end
- //
if (nPos == (size_t)-1)
{
- m_vMenuData.iPosition = MIT_END;
+ rItem.iPosition = MIT_END;
}
else
{
- m_vMenuData.iPosition = nPos;
+ rItem.iPosition = nPos;
}
- rc = (APIRET)::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&m_vMenuData, (MPARAM)pData);
+ APIRET rc;
+
+ rc = (APIRET)::WinSendMsg( GetHmenu()
+ ,MM_INSERTITEM
+ ,(MPARAM)&rItem
+ ,(MPARAM)pData
+ );
if (rc == MIT_MEMERROR || rc == MIT_ERROR)
{
vError = ::WinGetLastError(vHabmain);
{
MENUITEM vItem;
HWND hFrame;
- HWND hMenuBar = NULLHANDLE;
if (m_hMenu != 0 )
return m_hMenu;
//
// Create an empty menu and then fill it with insertions
//
- if (!wxWindow::OS2Create( hFrame
- ,WC_MENU
- ,"Menu"
- ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE
- ,0L
- ,0L
- ,0L
- ,0L
- ,hFrame
- ,HWND_TOP
- ,FID_MENU
- ,(PVOID)NULL
- ,(PVOID)NULL
- ))
- {
- 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
{
size_t nCount = GetMenuCount();
- hMenuBar = GetHwnd();
for (size_t i = 0; i < nCount; i++)
{
- ::WinSendMsg(hMenuBar, MM_INSERTITEM, (MPARAM)&m_menus[i]->m_vMenuData, (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 hMenuBar;
+ return m_hMenu;
} // end of wxMenuBar::Create
// ---------------------------------------------------------------------------
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
)
{
SHORT nId;
+ wxString Title = TextToLabel(rTitle);
wxMenu* pMenuOld = wxMenuBarBase::Replace( nPos
,pMenu
- ,rTitle
+ ,Title
);
}
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())
, 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
);
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())
{
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())
{
}
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
#if wxUSE_ACCEL
RebuildAccelTable();
+ //
+ // Ensure the accelerator table is set to the frame (not the client!)
+ //
+ if (!::WinSetAccelTable( vHabmain
+ ,(HWND)pFrame->GetFrame()
+ ,m_vAccelTable.GetHACCEL()
+ ))
+ wxLogLastError("WinSetAccelTable");
#endif // wxUSE_ACCEL
} // end of wxMenuBar::Attach
return pItem;
} // end of wxMenuBar::FindItem
+
projects / wxWidgets.git / blobdiff