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

fix wxMDIChildFrame after r69390 and r69468, TLW realization code should not be called, fixes #13593

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-10-25 16:56:57 +00:00
parent 9f17c488fb
commit 3ec3c160bc
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/gtk/mdi.h
View File

@@ -118,6 +118,7 @@ public:
void OnActivate( wxActivateEvent& event ); void OnActivate( wxActivateEvent& event );
void OnMenuHighlight( wxMenuEvent& event ); void OnMenuHighlight( wxMenuEvent& event );
virtual void GTKHandleRealized();
wxMenuBar *m_menuBar; wxMenuBar *m_menuBar;
bool m_justInserted; bool m_justInserted;

6
src/gtk/mdi.cpp
View File

@@ -294,6 +294,12 @@ wxMDIChildFrame::~wxMDIChildFrame()
gtk_widget_queue_draw(m_parent->m_widget); gtk_widget_queue_draw(m_parent->m_widget);
} }
void wxMDIChildFrame::GTKHandleRealized()
{
// since m_widget is not a GtkWindow, must bypass wxTopLevelWindowGTK
wxTopLevelWindowBase::GTKHandleRealized();
}
void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
{ {
wxASSERT_MSG( m_menuBar == NULL, "Only one menubar allowed" ); wxASSERT_MSG( m_menuBar == NULL, "Only one menubar allowed" );