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

wxUniv compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-10 12:25:46 +00:00
parent 7c36b6a2a1
commit 6522713c75
37 changed files with 170 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/msw/frame.cpp
View File

@@ -486,24 +486,10 @@ void wxFrameMSW::PositionStatusBar()
}
#endif // wxUSE_STATUSBAR
void wxFrameMSW::DetachMenuBar()
{
#if wxUSE_MENUS
if ( m_frameMenuBar )
{
m_frameMenuBar->Detach();
m_frameMenuBar = NULL;
}
#endif // wxUSE_MENUS
}
void wxFrameMSW::SetMenuBar(wxMenuBar *menubar)
{
#if wxUSE_MENUS
// detach the old menu bar in any case
DetachMenuBar();
#if wxUSE_MENUS_NATIVE
void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)
{
if ( !menubar )
{
// actually remove the menu from the frame
@@ -519,7 +505,7 @@ void wxFrameMSW::SetMenuBar(wxMenuBar *menubar)
}
else
{
if (menubar->IsAttached())
if ( menubar->IsAttached() )
menubar->Detach();
m_hMenu = menubar->Create();
@@ -530,18 +516,8 @@ void wxFrameMSW::SetMenuBar(wxMenuBar *menubar)
InternalSetMenuBar();
}
#endif // wxUSE_MENUS_NATIVE
if ( menubar )
{
m_frameMenuBar = menubar;
menubar->Attach((wxFrame *)this);
}
#endif // wxUSE_MENUS
}
#if wxUSE_MENUS_NATIVE
void wxFrameMSW::InternalSetMenuBar()
{
#ifndef __WXMICROWIN__