projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove gtk_window_set_type_hint from GetTooltipColors, it's not necessary and GDK_WIN...
[wxWidgets.git]
/
src
/
generic
/
mdig.cpp
diff --git
a/src/generic/mdig.cpp
b/src/generic/mdig.cpp
index 0e2f44031ca7d278c6877bee3d41899289414798..a1cdc3b08979a8b5a0753b99001572b7159c61ec 100644
(file)
--- a/
src/generic/mdig.cpp
+++ b/
src/generic/mdig.cpp
@@
-17,10
+17,6
@@
// headers
// ---------------------------------------------------------------------------
// 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"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-28,13
+24,18
@@
#pragma hdrstop
#endif
#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"
#ifndef WX_PRECOMP
#include "wx/panel.h"
#include "wx/menu.h"
#include "wx/intl.h"
+ #include "wx/log.h"
#endif //WX_PRECOMP
#endif //WX_PRECOMP
-#include "wx/
generic/mdig
.h"
+#include "wx/
stockitem
.h"
enum MDI_MENU_ID
{
enum MDI_MENU_ID
{
@@
-307,7
+308,7
@@
void wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
{
if (pMenuBar && m_pWindowMenu)
{
{
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"));
if (pos == wxNOT_FOUND)
{
pMenuBar->Append(m_pWindowMenu, _("&Window"));
@@
-344,6
+345,7
@@
void wxGenericMDIParentFrame::DoHandleMenu(wxCommandEvent &event)
{
#if 1 // What's best? Delayed deleting or immediate deleting?
delete m_pActiveChild;
{
#if 1 // What's best? Delayed deleting or immediate deleting?
delete m_pActiveChild;
+ m_pActiveChild = NULL;
#else
ActivateNext();
#else
ActivateNext();
@@
-401,7
+403,6
@@
wxGenericMDIChildFrame::wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent,
Create( parent, id, title, wxDefaultPosition, size, style, name );
}
Create( parent, id, title, wxDefaultPosition, size, style, name );
}
-#include "wx/log.h"
wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
{
wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();
wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
{
wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();
@@
-699,7
+700,7
@@
bool wxGenericMDIClientWindow::CreateClient( wxGenericMDIParentFrame *parent, lo
{
SetWindowStyleFlag(style);
{
SetWindowStyleFlag(style);
- bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0,
0), wxSize(100, 100), 0);
+ bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0,0), wxSize(100, 100), 0);
if (success)
{
/*
if (success)
{
/*
@@
-813,5
+814,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxGenericMDIParentFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxGenericMDIChildFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxGenericMDIClientWindow)
IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxGenericMDIChildFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxGenericMDIClientWindow)
-#endif
+#endif // wxUSE_GENERIC_MDI_AS_NATIVE
+
+#endif // wxUSE_MDI