X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fe7d506b191a94ce327c2a18733a4d3bc576cac..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/motif/mdi.cpp?ds=sidebyside diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp index a2076eaf31..4fa16b4cfe 100644 --- a/src/motif/mdi.cpp +++ b/src/motif/mdi.cpp @@ -6,17 +6,25 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "mdi.h" #endif +#ifdef __VMS +#define XtDisplay XTDISPLAY +#define XtWindow XTWINDOW +#endif + #include "wx/mdi.h" #include "wx/menu.h" #include "wx/settings.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include #include @@ -27,34 +35,36 @@ #include #include #include +#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 @@ -66,12 +76,12 @@ wxMDIParentFrame::wxMDIParentFrame() } 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; @@ -109,12 +119,6 @@ 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; @@ -122,11 +126,11 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *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; @@ -137,9 +141,14 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event) GetClientWindow()->SetSize(x, y, width, height); } -void wxMDIParentFrame::OnActivate(wxActivateEvent& event) +void wxMDIParentFrame::DoGetClientSize(int *width, int *height) const { - // Do nothing + wxFrame::DoGetClientSize(width, height); +} + +void wxMDIParentFrame::OnActivate(wxActivateEvent& WXUNUSED(event)) +{ + // Do nothing } // Returns the active MDI child window @@ -152,7 +161,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const // just return a new class) wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() { - return new wxMDIClientWindow ; + return new wxMDIClientWindow ; } // Set the child's menu into the parent frame @@ -164,17 +173,17 @@ void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child) { 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()); } } @@ -182,33 +191,33 @@ void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child) { 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()); } } } @@ -222,21 +231,33 @@ bool wxMDIParentFrame::ProcessEvent(wxEvent& event) return FALSE; inEvent = event.GetEventType(); - + 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) { @@ -272,6 +293,30 @@ void wxMDIParentFrame::ActivatePrevious() // 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() @@ -280,18 +325,19 @@ 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; @@ -306,8 +352,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, 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) @@ -329,86 +375,26 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, // 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); - + 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); + SetCanAddEventHandler(TRUE); 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(": 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); @@ -426,6 +412,10 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, wxMDIChildFrame::~wxMDIChildFrame() { + if (m_mainWidget) + XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,FALSE, + wxUniversalRepaintProc, (XtPointer) this); + if (GetMDIParentFrame()) { wxMDIParentFrame* parentFrame = GetMDIParentFrame(); @@ -436,7 +426,7 @@ wxMDIChildFrame::~wxMDIChildFrame() // Remove page if still there if (clientWindow->RemovePage(this)) - clientWindow->Refresh(); + clientWindow->Refresh(); // Set the selection to the first remaining page if (clientWindow->GetPageCount() > 0) @@ -492,29 +482,29 @@ void wxMDIChildFrame::OnLower() // Set the client size (i.e. leave the calculation of borders etc. // to wxWindows) -void wxMDIChildFrame::SetClientSize(int width, int height) +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) @@ -537,16 +527,20 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menuBar) // 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; @@ -562,9 +556,9 @@ void wxMDIChildFrame::Maximize() // TODO } -void wxMDIChildFrame::Iconize(bool iconize) +void wxMDIChildFrame::Iconize(bool WXUNUSED(iconize)) { - // TODO + // TODO } bool wxMDIChildFrame::IsIconized() const @@ -572,6 +566,13 @@ bool wxMDIChildFrame::IsIconized() const return FALSE; } +// Is it maximized? Always maximized under Motif, using the +// tabbed MDI implementation. +bool wxMDIChildFrame::IsMaximized(void) const +{ + return TRUE; +} + void wxMDIChildFrame::Restore() { // TODO @@ -584,22 +585,22 @@ void wxMDIChildFrame::Activate() 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)) @@ -615,7 +616,7 @@ wxMDIClientWindow::wxMDIClientWindow() 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; @@ -623,8 +624,10 @@ wxMDIClientWindow::~wxMDIClientWindow() 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) @@ -638,38 +641,38 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) return TRUE; } else - return FALSE; + return FALSE; } -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) @@ -687,19 +690,19 @@ void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event) } if (event.GetSelection() != -1) { - wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection()); - if (activeChild) - { - 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(); }