menu bar wasn't set properly internally after my previous change - fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7d29741468
commit
6beb85c0d3
@ -139,15 +139,6 @@ bool wxFrameMSW::Create(wxWindow *parent,
|
||||
{
|
||||
SetName(name);
|
||||
m_windowStyle = style;
|
||||
#if wxUSE_MENUS
|
||||
m_frameMenuBar = NULL;
|
||||
#endif // wxUSE_MENUS
|
||||
#if wxUSE_TOOLBAR
|
||||
m_frameToolBar = NULL;
|
||||
#endif // wxUSE_TOOLBAR
|
||||
#if wxUSE_STATUSBAR
|
||||
m_frameStatusBar = NULL;
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
|
||||
|
||||
@ -490,6 +481,8 @@ void wxFrameMSW::PositionStatusBar()
|
||||
|
||||
void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)
|
||||
{
|
||||
m_frameMenuBar = menubar;
|
||||
|
||||
if ( !menubar )
|
||||
{
|
||||
// actually remove the menu from the frame
|
||||
|
Loading…
Reference in New Issue
Block a user