From 3ec3c160bcca109c6c788f0d3d1c38edab902568 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 25 Oct 2011 16:56:57 +0000 Subject: [PATCH] fix wxMDIChildFrame after r69390 and r69468, TLW realization code should not be called, fixes #13593 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/mdi.h | 1 + src/gtk/mdi.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index d4d65c0439..dcb4b01d15 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -118,6 +118,7 @@ public: void OnActivate( wxActivateEvent& event ); void OnMenuHighlight( wxMenuEvent& event ); + virtual void GTKHandleRealized(); wxMenuBar *m_menuBar; bool m_justInserted; diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index 760a4ac4ef..bd97417ddd 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -294,6 +294,12 @@ wxMDIChildFrame::~wxMDIChildFrame() 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 ) { wxASSERT_MSG( m_menuBar == NULL, "Only one menubar allowed" ); -- 2.45.2