X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/902725eefee5a402d21d13b2630583ab28ae3931..677dc0ed1a3ff68af15f6246d6d0708d5264b07a:/src/generic/mdig.cpp diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp index 7e950d0542..a1cdc3b089 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" @@ -28,13 +24,18 @@ #pragma hdrstop #endif +#if wxUSE_MDI + +#include "wx/generic/mdig.h" + #ifndef WX_PRECOMP #include "wx/panel.h" #include "wx/menu.h" #include "wx/intl.h" + #include "wx/log.h" #endif //WX_PRECOMP -#include "wx/generic/mdig.h" +#include "wx/stockitem.h" enum MDI_MENU_ID { @@ -307,7 +308,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")); @@ -402,7 +403,6 @@ wxGenericMDIChildFrame::wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent, Create( parent, id, title, wxDefaultPosition, size, style, name ); } -#include "wx/log.h" wxGenericMDIChildFrame::~wxGenericMDIChildFrame() { wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame(); @@ -814,5 +814,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxGenericMDIParentFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxGenericMDIChildFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxGenericMDIClientWindow) -#endif +#endif // wxUSE_GENERIC_MDI_AS_NATIVE + +#endif // wxUSE_MDI