X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/121a3581d3545e8eadcb3c8bec31dd507132e83f..ea804aadf91c963d97a56e152d8372c9e689affe:/src/gtk1/frame.cpp?ds=inline diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 6fe147fa9b..365f857639 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -413,6 +413,8 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, wxFrame::~wxFrame() { + m_isBeingDeleted = TRUE; + if (m_frameMenuBar) delete m_frameMenuBar; m_frameMenuBar = (wxMenuBar *) NULL; @@ -536,11 +538,11 @@ void wxFrame::Centre( int direction ) Move( x, y ); } -void wxFrame::GetClientSize( int *width, int *height ) const +void wxFrame::DoGetClientSize( int *width, int *height ) const { wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); - wxWindow::GetClientSize( width, height ); + wxWindow::DoGetClientSize( width, height ); if (height) { /* menu bar */