// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "mdi.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
#endif
#include "wx/mdi.h"
#include "wx/menu.h"
#include "wx/settings.h"
+#include "wx/icon.h"
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
#include <Xm/BulletinB.h>
#include <Xm/Form.h>
#include <Xm/PushBG.h>
#include <Xm/AtomMgr.h>
#include <Xm/Protocols.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/motif/private.h"
extern wxList wxModelessWindows;
// Implemented in frame.cpp
-extern void wxFrameFocusProc(Widget workArea, XtPointer clientData,
- XmAnyCallbackStruct *cbs);
+extern void wxFrameFocusProc(Widget workArea, XtPointer clientData,
+ XmAnyCallbackStruct *cbs);
#define wxID_NOTEBOOK_CLIENT_AREA wxID_HIGHEST + 100
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxNotebook)
BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
- EVT_SIZE(wxMDIParentFrame::OnSize)
- EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
- EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+ EVT_SIZE(wxMDIParentFrame::OnSize)
+ EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
+ EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+ EVT_MENU_HIGHLIGHT_ALL(wxMDIParentFrame::OnMenuHighlight)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook)
- EVT_SCROLL(wxMDIClientWindow::OnScroll)
- EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
+ EVT_SCROLL(wxMDIClientWindow::OnScroll)
+ EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
END_EVENT_TABLE()
-#endif
// Parent frame
}
bool wxMDIParentFrame::Create(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
m_clientWindow = (wxMDIClientWindow*) NULL;
m_activeChild = (wxMDIChildFrame*) NULL;
int w, h;
GetClientSize(& w, & h);
m_clientWindow->SetSize(0, 0, w, h);
- return TRUE;
+ return true;
}
else
- return FALSE;
+ return false;
}
wxMDIParentFrame::~wxMDIParentFrame()
m_clientWindow = NULL;
}
-// Get size *available for subwindows* i.e. excluding menu bar.
-void wxMDIParentFrame::GetClientSize(int *x, int *y) const
-{
- wxFrame::GetClientSize(x, y);
-}
-
void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
{
m_frameMenuBar = menu_bar;
SetChildMenuBar((wxMDIChildFrame*) NULL);
}
-void wxMDIParentFrame::OnSize(wxSizeEvent& event)
+void wxMDIParentFrame::OnSize(wxSizeEvent& WXUNUSED(event))
{
#if wxUSE_CONSTRAINTS
if (GetAutoLayout())
- Layout();
+ Layout();
#endif
int x = 0;
int y = 0;
GetClientWindow()->SetSize(x, y, width, height);
}
-void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
+void wxMDIParentFrame::DoGetClientSize(int *width, int *height) const
+{
+ wxFrame::DoGetClientSize(width, height);
+}
+
+void wxMDIParentFrame::OnActivate(wxActivateEvent& WXUNUSED(event))
{
- // Do nothing
+ // Do nothing
}
// Returns the active MDI child window
// just return a new class)
wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
{
- return new wxMDIClientWindow ;
+ return new wxMDIClientWindow ;
}
// Set the child's menu into the parent frame
{
if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
{
- // if (m_activeMenuBar)
- // m_activeMenuBar->DestroyMenuBar();
+ // if (m_activeMenuBar)
+ // m_activeMenuBar->DestroyMenuBar();
m_activeMenuBar = GetMenuBar();
m_activeMenuBar->CreateMenuBar(this);
- /*
+ /*
if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
- XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
- */
+ XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
+ */
if (oldMenuBar && oldMenuBar->GetMainWidget())
- XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
+ XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
}
}
{
if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
{
- // if (m_activeMenuBar)
- // m_activeMenuBar->DestroyMenuBar();
+ // if (m_activeMenuBar)
+ // m_activeMenuBar->DestroyMenuBar();
m_activeMenuBar = GetMenuBar();
m_activeMenuBar->CreateMenuBar(this);
- /*
+ /*
if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
- XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
- */
+ XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
+ */
if (oldMenuBar && oldMenuBar->GetMainWidget())
- XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
+ XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
}
}
else // The child has a menubar
{
if (child->GetMenuBar() != m_activeMenuBar)
{
- // if (m_activeMenuBar)
- // m_activeMenuBar->DestroyMenuBar();
+ // if (m_activeMenuBar)
+ // m_activeMenuBar->DestroyMenuBar();
m_activeMenuBar = child->GetMenuBar();
m_activeMenuBar->CreateMenuBar(this);
- /*
+ /*
if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
- XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
- */
+ XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
+ */
if (oldMenuBar && oldMenuBar->GetMainWidget())
- XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
+ XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
}
}
}
// Stops the same event being processed repeatedly
static wxEventType inEvent = wxEVT_NULL;
if (inEvent == event.GetEventType())
- return FALSE;
+ return false;
inEvent = event.GetEventType();
-
- bool res = FALSE;
+
+ bool res = false;
if (m_activeChild && event.IsKindOf(CLASSINFO(wxCommandEvent)))
{
- res = m_activeChild->GetEventHandler()->ProcessEvent(event);
+ res = m_activeChild->GetEventHandler()->ProcessEvent(event);
}
if (!res)
- res = GetEventHandler()->wxEvtHandler::ProcessEvent(event);
+ res = GetEventHandler()->wxEvtHandler::ProcessEvent(event);
inEvent = wxEVT_NULL;
return res;
}
+void wxMDIParentFrame::DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags)
+{
+ wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+}
+
+void wxMDIParentFrame::DoSetClientSize(int width, int height)
+{
+ wxWindow::DoSetClientSize(width, height);
+}
+
// Responds to colour changes, and passes event on to children.
void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
// TODO
}
-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation WXUNUSED(orient))
{
// TODO
}
// TODO
}
+// Default menu selection behaviour - display a help string
+void wxMDIParentFrame::OnMenuHighlight(wxMenuEvent& event)
+{
+ if (GetStatusBar())
+ {
+ if (event.GetMenuId() == -1)
+ SetStatusText("");
+ else
+ {
+ wxMenuBar *menuBar = (wxMenuBar*) NULL;
+ if (GetActiveChild())
+ menuBar = GetActiveChild()->GetMenuBar();
+ else
+ menuBar = GetMenuBar();
+ if (menuBar)
+ {
+ wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
+ if (helpString != "")
+ SetStatusText(helpString);
+ }
+ }
+ }
+}
+
// Child frame
wxMDIChildFrame::wxMDIChildFrame()
}
bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
SetName(name);
+ SetWindowStyleFlag(style);
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
m_foregroundColour = *wxBLACK;
- m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
if ( id > -1 )
m_windowId = id;
SetMDIParentFrame(parent);
- int x = pos.x; int y = pos.y;
- int width = size.x; int height = size.y;
+ int width = size.x;
+ int height = size.y;
if (width == -1)
width = 200; // TODO: give reasonable default
if (height == -1)
wxMDIChildFrame* oldActiveChild = parent->GetActiveChild();
if (oldActiveChild)
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());
event.SetEventObject( oldActiveChild );
oldActiveChild->GetEventHandler()->ProcessEvent(event);
}
// the 'frame'. A main window doesn't seem to work.
m_mainWidget = (WXWidget) XtVaCreateWidget("client",
- xmBulletinBoardWidgetClass, (Widget) clientWindow->GetTopWidget(),
- XmNmarginWidth, 0,
- XmNmarginHeight, 0,
- /*
- XmNrightAttachment, XmATTACH_FORM,
- XmNleftAttachment, XmATTACH_FORM,
- XmNtopAttachment, XmATTACH_FORM,
- XmNbottomAttachment, XmATTACH_FORM,
- */
- XmNresizePolicy, XmRESIZE_NONE,
- NULL);
-
- SetCanAddEventHandler(TRUE);
+ xmBulletinBoardWidgetClass, (Widget) clientWindow->GetTopWidget(),
+ XmNmarginWidth, 0,
+ XmNmarginHeight, 0,
+ /*
+ XmNrightAttachment, XmATTACH_FORM,
+ XmNleftAttachment, XmATTACH_FORM,
+ XmNtopAttachment, XmATTACH_FORM,
+ XmNbottomAttachment, XmATTACH_FORM,
+ */
+ XmNresizePolicy, XmRESIZE_NONE,
+ NULL);
+
+ XtAddEventHandler((Widget) m_mainWidget, ExposureMask,False,
+ wxUniversalRepaintProc, (XtPointer) this);
+
AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
ChangeBackgroundColour();
- // Old stuff
-#if 0
-
- m_frameWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
- xmMainWindowWidgetClass, (Widget) clientWindow->GetTopWidget(),
- XmNresizePolicy, XmRESIZE_NONE,
- NULL);
-
- // TODO: make sure this doesn't cause problems.
- // I think ~wxFrame will do the right thing since it deletes m_frameWidget,
- // then sets the main widget to NULL.
- m_mainWidget = m_frameWidget;
-
- m_workArea = (WXWidget) XtVaCreateWidget("form",
- xmFormWidgetClass, (Widget) m_frameWidget,
- XmNresizePolicy, XmRESIZE_NONE,
- NULL);
-
- m_clientArea = (WXWidget) XtVaCreateWidget("client",
- xmBulletinBoardWidgetClass, (Widget) m_workArea,
- XmNmarginWidth, 0,
- XmNmarginHeight, 0,
- XmNrightAttachment, XmATTACH_FORM,
- XmNleftAttachment, XmATTACH_FORM,
- XmNtopAttachment, XmATTACH_FORM,
- XmNbottomAttachment, XmATTACH_FORM,
-// XmNresizePolicy, XmRESIZE_ANY,
- NULL);
-
- XtVaSetValues((Widget) m_frameWidget,
- XmNworkWindow, (Widget) m_workArea,
- NULL);
-
- XtManageChild((Widget) m_clientArea);
- XtManageChild((Widget) m_workArea);
-
- wxASSERT_MSG ((wxWidgetHashTable->Get((long)m_workArea) == (wxObject*) NULL), "Widget table clash in frame.cpp") ;
-
- wxAddWindowToTable((Widget) m_workArea, this);
-
- XtTranslations ptr ;
-
- XtOverrideTranslations((Widget) m_workArea,
- ptr = XtParseTranslationTable("<Configure>: resize()"));
-
- XtFree((char *)ptr);
-
- XtAddCallback((Widget) m_workArea, XmNfocusCallback,
- (XtCallbackProc)wxFrameFocusProc, (XtPointer)this);
-
- XtManageChild((Widget) m_mainWidget);
-
- if (x > -1)
- XtVaSetValues((Widget) m_mainWidget, XmNx, x, NULL);
- if (y > -1)
- XtVaSetValues((Widget) m_mainWidget, XmNy, y, NULL);
- if (width > -1)
- XtVaSetValues((Widget) m_mainWidget, XmNwidth, width, NULL);
- if (height > -1)
- XtVaSetValues((Widget) m_mainWidget, XmNheight, height, NULL);
-
-#endif
-
XtManageChild((Widget) m_mainWidget);
SetTitle(title);
- clientWindow->AddPage(this, title, TRUE);
+ clientWindow->AddPage(this, title, true);
clientWindow->Refresh();
// Positions the toolbar and status bar -- but we don't have any.
// PreResize();
wxModelessWindows.Append(this);
- return TRUE;
+ return true;
}
wxMDIChildFrame::~wxMDIChildFrame()
{
+ if (m_mainWidget)
+ XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,False,
+ wxUniversalRepaintProc, (XtPointer) this);
+
if (GetMDIParentFrame())
{
wxMDIParentFrame* parentFrame = GetMDIParentFrame();
wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();
// Remove page if still there
- if (clientWindow->RemovePage(this))
- clientWindow->Refresh();
+ {
+ int i = clientWindow->FindPage(this);
+
+ if (i != -1)
+ {
+ clientWindow->RemovePage(i);
+ clientWindow->Refresh();
+ }
+ }
// Set the selection to the first remaining page
if (clientWindow->GetPageCount() > 0)
if (oldActiveChild)
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());
event.SetEventObject( oldActiveChild );
oldActiveChild->GetEventHandler()->ProcessEvent(event);
}
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, this->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, true, this->GetId());
event.SetEventObject( this );
this->GetEventHandler()->ProcessEvent(event);
}
if (oldActiveChild == this)
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());
event.SetEventObject( oldActiveChild );
oldActiveChild->GetEventHandler()->ProcessEvent(event);
}
#endif
// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
-void wxMDIChildFrame::SetClientSize(int width, int height)
+// to wxWidgets)
+void wxMDIChildFrame::DoSetClientSize(int width, int height)
{
- wxWindow::SetClientSize(width, height);
+ wxWindow::DoSetClientSize(width, height);
}
-void wxMDIChildFrame::GetClientSize(int* width, int* height) const
+void wxMDIChildFrame::DoGetClientSize(int* width, int* height) const
{
- wxWindow::GetSize(width, height);
+ wxWindow::DoGetSize(width, height);
}
-void wxMDIChildFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- wxWindow::SetSize(x, y, width, height, sizeFlags);
+ wxWindow::DoSetSize(x, y, width, height, sizeFlags);
}
-void wxMDIChildFrame::GetSize(int* width, int* height) const
+void wxMDIChildFrame::DoGetSize(int* width, int* height) const
{
- wxWindow::GetSize(width, height);
+ wxWindow::DoGetSize(width, height);
}
-void wxMDIChildFrame::GetPosition(int *x, int *y) const
+void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
{
- wxWindow::GetPosition(x, y);
+ wxWindow::DoGetPosition(x, y);
}
bool wxMDIChildFrame::Show(bool show)
{
- m_visibleStatus = show; /* show-&-hide fix */
+ SetVisibleStatus( show );
return wxWindow::Show(show);
}
// Set icon
void wxMDIChildFrame::SetIcon(const wxIcon& icon)
{
- m_icon = icon;
- if (m_icon.Ok())
+ m_icons = wxIconBundle( icon );
+
+ if (icon.Ok())
{
- /* TODO: doesn't work yet (crashes in XCopyArea)
- Pixmap pixmap = (Pixmap) m_icon.GetPixmap();
- m_mdiWindow->setPixmap(pixmap);
- */
+ // Not appropriate since there are no icons in
+ // a tabbed window
}
}
+void wxMDIChildFrame::SetIcons(const wxIconBundle& icons)
+{
+ m_icons = icons;
+}
+
void wxMDIChildFrame::SetTitle(const wxString& title)
{
- m_title = title;
- // TODO: set parent frame title
+ wxTopLevelWindow::SetTitle( title );
+ wxMDIClientWindow* clientWindow = GetMDIParentFrame()->GetClientWindow();
+
+ // Remove page if still there
+ {
+ int i = clientWindow->FindPage(this);
+
+ if (i != -1)
+ clientWindow->SetPageText(i, title);
+ }
}
// MDI operations
// TODO
}
-void wxMDIChildFrame::Iconize(bool iconize)
+void wxMDIChildFrame::Iconize(bool WXUNUSED(iconize))
{
- // TODO
+ // TODO
}
bool wxMDIChildFrame::IsIconized() const
{
- return FALSE;
+ return false;
+}
+
+// Is it maximized? Always maximized under Motif, using the
+// tabbed MDI implementation.
+bool wxMDIChildFrame::IsMaximized(void) const
+{
+ return true;
}
void wxMDIChildFrame::Restore()
void wxMDIChildFrame::CaptureMouse()
{
- wxWindow::CaptureMouse();
+ wxWindow::CaptureMouse();
}
void wxMDIChildFrame::ReleaseMouse()
{
- wxWindow::ReleaseMouse();
+ wxWindow::ReleaseMouse();
}
void wxMDIChildFrame::Raise()
{
- wxWindow::Raise();
+ wxWindow::Raise();
}
void wxMDIChildFrame::Lower(void)
{
- wxWindow::Raise();
+ wxWindow::Raise();
}
-void wxMDIChildFrame::SetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
+void wxMDIChildFrame::DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
{
}
wxMDIClientWindow::~wxMDIClientWindow()
{
// By the time this destructor is called, the child frames will have been
- // deleted and removed from the notebook/client window.
+ // deleted and removed from the notebook/client window.
DestroyChildren();
m_mainWidget = (WXWidget) 0;
bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
{
- // m_windowParent = parent;
- // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ SetWindowStyleFlag(style);
+
+ // m_windowParent = parent;
+ // m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+
+ bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
+ if (success)
+ {
+ wxFont font(10, wxSWISS, wxNORMAL, wxNORMAL);
+ SetFont(font);
+ return true;
+ }
+ else
+ return false;
+}
+
+int wxMDIClientWindow::FindPage(const wxNotebookPage* page)
+{
+ for (int i = GetPageCount() - 1; i >= 0; --i)
+ {
+ if (GetPage(i) == page)
+ return i;
+ }
- return wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
+ return -1;
}
-void wxMDIClientWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- wxWindow::SetSize(x, y, width, height, sizeFlags);
+ wxWindow::DoSetSize(x, y, width, height, sizeFlags);
}
-void wxMDIClientWindow::SetClientSize(int width, int height)
+void wxMDIClientWindow::DoSetClientSize(int width, int height)
{
- wxWindow::SetClientSize(width, height);
+ wxWindow::DoSetClientSize(width, height);
}
-void wxMDIClientWindow::GetClientSize(int *width, int *height) const
+void wxMDIClientWindow::DoGetClientSize(int *width, int *height) const
{
- wxWindow::GetClientSize(width, height);
+ wxWindow::DoGetClientSize(width, height);
}
-void wxMDIClientWindow::GetSize(int *width, int *height) const
+void wxMDIClientWindow::DoGetSize(int *width, int *height) const
{
- wxWindow::GetSize(width, height);
+ wxWindow::DoGetSize(width, height);
}
-void wxMDIClientWindow::GetPosition(int *x, int *y) const
+void wxMDIClientWindow::DoGetPosition(int *x, int *y) const
{
- wxWindow::GetPosition(x, y);
+ wxWindow::DoGetPosition(x, y);
}
-// Explicitly call default scroll behaviour
void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
{
- Default(); // Default processing
+ // Default(); // Default processing: OBSOLETE FUNCTION
+ event.Skip();
}
void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)
wxMDIChildFrame* oldChild = (wxMDIChildFrame*) GetPage(event.GetOldSelection());
if (oldChild)
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, false, oldChild->GetId());
event.SetEventObject( oldChild );
oldChild->GetEventHandler()->ProcessEvent(event);
}
}
- wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
- if (activeChild)
+ if (event.GetSelection() != -1)
{
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, activeChild->GetId());
- event.SetEventObject( activeChild );
- activeChild->GetEventHandler()->ProcessEvent(event);
-
- if (activeChild->GetMDIParentFrame())
+ wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
+ if (activeChild)
{
- activeChild->GetMDIParentFrame()->SetActiveChild(activeChild);
- activeChild->GetMDIParentFrame()->SetChildMenuBar(activeChild);
+ wxActivateEvent event(wxEVT_ACTIVATE, true, activeChild->GetId());
+ event.SetEventObject( activeChild );
+ activeChild->GetEventHandler()->ProcessEvent(event);
+
+ if (activeChild->GetMDIParentFrame())
+ {
+ activeChild->GetMDIParentFrame()->SetActiveChild(activeChild);
+ activeChild->GetMDIParentFrame()->SetChildMenuBar(activeChild);
+ }
}
}
event.Skip();
projects / wxWidgets.git / blobdiff