Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of fixes for OS/2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-01-23 23:12:33 +00:00
parent bd330a69c9
commit e58dab20ce
17 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/os2/menu.cpp
View File

@@ -628,7 +628,7 @@ wxMenuItem* wxMenu::FindItem(
void wxMenuBar::Init()
{
m_eventHandler = this;
m_pMenuBarFrame = NULL;
m_menuBarFrame = NULL;
m_hMenu = 0;
} // end of wxMenuBar::Init
@@ -673,7 +673,7 @@ void wxMenuBar::Refresh()
{
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()
@@ -689,8 +689,8 @@ 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;
//
@@ -900,8 +900,6 @@ bool wxMenuBar::Insert(
,nPos
);
pMenu->Attach(this);
if (IsAttached())
{
::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());
@@ -1024,7 +1022,7 @@ void wxMenuBar::Attach(
)
{
wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
m_pMenuBarFrame = pFrame;
m_menuBarFrame = pFrame;
#if wxUSE_ACCEL
RebuildAccelTable();
@@ -1043,7 +1041,7 @@ void wxMenuBar::Detach()
{
::WinDestroyWindow((HWND)m_hMenu);
m_hMenu = (WXHMENU)NULL;
m_pMenuBarFrame = NULL;
m_menuBarFrame = NULL;
} // end of wxMenuBar::Detach
// ---------------------------------------------------------------------------