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

removed MSWDetachWindowMenu() (part of the MDI change from yesterday which I forgot to commit)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-13 18:34:26 +00:00
parent d60f101215
commit 66689a9ee9
1 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/msw/window.cpp
View File

@@ -320,8 +320,6 @@ wxWindowMSW::~wxWindowMSW()
{ {
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
MSWDetachWindowMenu();
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us: // VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
@@ -2682,38 +2680,6 @@ void wxWindowMSW::MSWDestroyWindow()
{ {
} }
void wxWindowMSW::MSWDetachWindowMenu()
{
#ifndef __WXUNIVERSAL__
if ( m_hMenu )
{
wxChar buf[1024];
HMENU hMenu = (HMENU)m_hMenu;
int N = ::GetMenuItemCount(hMenu);
for ( int i = 0; i < N; i++ )
{
if ( !::GetMenuString(hMenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) )
{
wxLogLastError(wxT("GetMenuString"));
continue;
}
if ( wxStrcmp(buf, _("&Window")) == 0 )
{
if ( !::RemoveMenu(hMenu, i, MF_BYPOSITION) )
{
wxLogLastError(wxT("RemoveMenu"));
}
break;
}
}
}
#endif // __WXUNIVERSAL__
}
bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos, bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
const wxSize& size, const wxSize& size,
int& x, int& y, int& x, int& y,