X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2997ca30d66c2dc778ed9a84c8c94fea6ec1c958..f15fa3a93ffd477077d1255ebd9d6335758021c4:/src/generic/mdig.cpp diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp index 8d33478b6d..b1e79b5969 100644 --- a/src/generic/mdig.cpp +++ b/src/generic/mdig.cpp @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "mdig.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -35,6 +31,7 @@ #endif //WX_PRECOMP #include "wx/generic/mdig.h" +#include "wx/stockitem.h" enum MDI_MENU_ID { @@ -307,7 +304,7 @@ void wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar) { if (pMenuBar && m_pWindowMenu) { - int pos = pMenuBar->FindMenu(_("Help")); + int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,false)); if (pos == wxNOT_FOUND) { pMenuBar->Append(m_pWindowMenu, _("&Window")); @@ -344,6 +341,7 @@ void wxGenericMDIParentFrame::DoHandleMenu(wxCommandEvent &event) { #if 1 // What's best? Delayed deleting or immediate deleting? delete m_pActiveChild; + m_pActiveChild = NULL; #else ActivateNext(); @@ -699,7 +697,7 @@ bool wxGenericMDIClientWindow::CreateClient( wxGenericMDIParentFrame *parent, lo { SetWindowStyleFlag(style); - bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(), wxSize(100, 100), 0); + bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0,0), wxSize(100, 100), 0); if (success) { /*