]> git.saurik.com Git - wxWidgets.git/commitdiff
remove Motif MDI files not used any longer
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 5 Nov 2008 10:01:45 +0000 (10:01 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 5 Nov 2008 10:01:45 +0000 (10:01 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/motif/mdi.h [deleted file]
src/motif/mdi.cpp [deleted file]

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
deleted file mode 100644 (file)
index f4909dd..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/mdi.h
-// Purpose:     MDI (Multiple Document Interface) classes.
-// Author:      Julian Smart
-// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
-// Created:     17/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-//              (c) 2008 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_MDI_H_
-#define _WX_MOTIF_MDI_H_
-
-class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase
-{
-public:
-    wxMDIParentFrame() { Init(); }
-    wxMDIParentFrame(wxWindow *parent,
-                     wxWindowID id,
-                     const wxString& title,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                     const wxString& name = wxFrameNameStr)
-    {
-        Init();
-
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr);
-
-    virtual ~wxMDIParentFrame();
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    static bool IsTDI() { return true; }
-
-    virtual void ActivateNext() { /* TODO */ }
-    virtual void ActivatePrevious() { /* TODO */ }
-
-
-    // Implementation
-
-    // Set the child's menubar into the parent frame
-    void SetChildMenuBar(wxMDIChildFrame* frame);
-
-    wxMenuBar* GetActiveMenuBar() const { return m_activeMenuBar; }
-
-    // Redirect events to active child first
-    virtual bool ProcessEvent(wxEvent& event);
-
-    void OnSize(wxSizeEvent& event);
-    void OnActivate(wxActivateEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-    void OnMenuHighlight(wxMenuEvent& event);
-
-    void SetMenuBar(wxMenuBar *menu_bar);
-
-protected:
-    wxMenuBar *m_activeMenuBar;
-
-private:
-    void Init();
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-};
-
-class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxTDIChildFrame
-{
-public:
-    wxMDIChildFrame() { }
-    wxMDIChildFrame(wxMDIParentFrame *parent,
-                    wxWindowID id,
-                    const wxString& title,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr)
-    {
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxMDIParentFrame *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    virtual ~wxMDIChildFrame();
-
-
-    // Set menu bar
-    void SetMenuBar(wxMenuBar *menu_bar);
-    void SetTitle(const wxString& title);
-
-    // Set icon
-    virtual void SetIcon(const wxIcon& icon);
-    virtual void SetIcons(const wxIconBundle& icons );
-
-    // Override wxFrame operations
-    void CaptureMouse();
-    void ReleaseMouse();
-    void Raise();
-    void Lower(void);
-
-    // MDI operations
-    virtual void Maximize();
-    virtual void Maximize(bool WXUNUSED(maximize)) { };
-    inline void Minimize() { Iconize(true); };
-    virtual void Iconize(bool iconize);
-    virtual void Restore();
-    virtual void Activate();
-    virtual bool IsIconized() const ;
-
-    virtual bool IsTopLevel() const { return false; }
-
-    // Is the frame maximized? Returns true for
-    // wxMDIChildFrame due to the tabbed implementation.
-    virtual bool IsMaximized(void) const ;
-
-    bool Show(bool show);
-
-    WXWidget GetMainWidget() const { return m_mainWidget; };
-    WXWidget GetTopWidget() const { return m_mainWidget; };
-    WXWidget GetClientWidget() const { return m_mainWidget; };
-
-protected:
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-};
-
-class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
-{
-public:
-    wxMDIClientWindow() { }
-    virtual ~wxMDIClientWindow();
-
-    virtual bool CreateClient(wxMDIParentFrame *parent,
-                              long style = wxVSCROLL | wxHSCROLL);
-
-    // Implementation
-    void OnPageChanged(wxBookCtrlEvent& event);
-
-    int FindPage(const wxNotebookPage* page);
-
-protected:
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoGetSize(int *width, int *height) const ;
-    virtual void DoGetPosition(int *x, int *y) const ;
-
-    wxNotebook *m_notebook;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
-};
-
-#endif // _WX_MOTIF_MDI_H_
diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
deleted file mode 100644 (file)
index f776c1d..0000000
+++ /dev/null
@@ -1,465 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/motif/mdi.cpp
-// Purpose:     MDI classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#include "wx/mdi.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/menu.h"
-    #include "wx/icon.h"
-    #include "wx/settings.h"
-#endif
-
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#include <Xm/BulletinB.h>
-#include <Xm/Form.h>
-#include <Xm/MainW.h>
-#include <Xm/RowColumn.h>
-#include <Xm/CascadeBG.h>
-#include <Xm/Text.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);
-
-#define wxID_NOTEBOOK_CLIENT_AREA wxID_HIGHEST + 100
-
-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_MENU_HIGHLIGHT_ALL(wxMDIParentFrame::OnMenuHighlight)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook)
-    EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
-END_EVENT_TABLE()
-
-
-// Parent frame
-
-void wxMDIParentFrame::Init()
-{
-    m_activeMenuBar = NULL;
-}
-
-bool wxMDIParentFrame::Create(wxWindow *parent,
-                              wxWindowID id,
-                              const wxString& title,
-                              const wxPoint& pos,
-                              const wxSize& size,
-                              long style,
-                              const wxString& name)
-{
-    if ( !wxFrame::Create(parent, id, title, pos, size, style, name) )
-        return false;
-
-    m_clientWindow = OnCreateClient();
-    if ( !m_clientWindow->CreateClient(this, GetWindowStyleFlag()) )
-        return false;
-
-    int w, h;
-    GetClientSize(& w, & h);
-    m_clientWindow->SetSize(0, 0, w, h);
-    return true;
-}
-
-wxMDIParentFrame::~wxMDIParentFrame()
-{
-    // Make sure we delete the client window last of all
-    RemoveChild(m_clientWindow);
-
-    DestroyChildren();
-
-    delete m_clientWindow;
-    m_clientWindow = NULL;
-}
-
-void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
-{
-    m_frameMenuBar = menu_bar;
-
-    SetChildMenuBar(NULL);
-}
-
-void wxMDIParentFrame::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#endif
-    int x = 0;
-    int y = 0;
-    int width, height;
-    GetClientSize(&width, &height);
-
-    if ( GetClientWindow() )
-        GetClientWindow()->SetSize(x, y, width, height);
-}
-
-void wxMDIParentFrame::OnActivate(wxActivateEvent& WXUNUSED(event))
-{
-    // Do nothing
-}
-
-// Set the child's menu into the parent frame
-void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child)
-{
-    wxMenuBar* oldMenuBar = m_activeMenuBar;
-
-    if (child == NULL)  // No child: use parent frame
-    {
-        if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
-        {
-            //            if (m_activeMenuBar)
-            //                m_activeMenuBar->DestroyMenuBar();
-
-            m_activeMenuBar = GetMenuBar();
-            m_activeMenuBar->CreateMenuBar(this);
-            /*
-            if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
-            XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
-            */
-            if (oldMenuBar && oldMenuBar->GetMainWidget())
-                XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
-
-        }
-    }
-    else if (child->GetMenuBar() == NULL) // No child menu bar: use parent frame
-    {
-        if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
-        {
-            //            if (m_activeMenuBar)
-            //                m_activeMenuBar->DestroyMenuBar();
-            m_activeMenuBar = GetMenuBar();
-            m_activeMenuBar->CreateMenuBar(this);
-            /*
-            if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
-            XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
-            */
-            if (oldMenuBar && oldMenuBar->GetMainWidget())
-                XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
-        }
-    }
-    else // The child has a menubar
-    {
-        if (child->GetMenuBar() != m_activeMenuBar)
-        {
-            //            if (m_activeMenuBar)
-            //                m_activeMenuBar->DestroyMenuBar();
-
-            m_activeMenuBar = child->GetMenuBar();
-            m_activeMenuBar->CreateMenuBar(this);
-            /*
-            if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
-            XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
-            */
-            if (oldMenuBar && oldMenuBar->GetMainWidget())
-                XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
-        }
-    }
-}
-
-// Redirect events to active child first
-bool wxMDIParentFrame::ProcessEvent(wxEvent& event)
-{
-    // Stops the same event being processed repeatedly
-    static wxEventType inEvent = wxEVT_NULL;
-    if (inEvent == event.GetEventType())
-        return false;
-
-    inEvent = event.GetEventType();
-
-    bool res = false;
-    if (m_currentChild && event.IsKindOf(CLASSINFO(wxCommandEvent)))
-    {
-        res = m_currentChild->HandleWindowEvent(event);
-    }
-
-    if (!res)
-        res = GetEventHandler()->wxEvtHandler::ProcessEvent(event);
-
-    inEvent = wxEVT_NULL;
-
-    return res;
-}
-
-// Responds to colour changes, and passes event on to children.
-void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    // TODO
-
-    // Propagate the event to the non-top-level children
-    wxFrame::OnSysColourChanged(event);
-}
-
-// Default menu selection behaviour - display a help string
-void wxMDIParentFrame::OnMenuHighlight(wxMenuEvent& event)
-{
-    if (GetStatusBar())
-    {
-        if (event.GetMenuId() == -1)
-            SetStatusText(wxEmptyString);
-        else
-        {
-            wxMenuBar *menuBar = NULL;
-            if (GetActiveChild())
-              menuBar = GetActiveChild()->GetMenuBar();
-            else
-              menuBar = GetMenuBar();
-            if (menuBar)
-            {
-                wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
-                if (!helpString.empty())
-                    SetStatusText(helpString);
-            }
-        }
-    }
-}
-
-// Child frame
-
-bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
-                             wxWindowID id,
-                             const wxString& title,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style,
-                             const wxString& name)
-{
-    SetName(name);
-    SetWindowStyleFlag(style);
-
-    if ( id > -1 )
-        m_windowId = id;
-    else
-        m_windowId = (int)NewControlId();
-
-    wxMDIClientWindow* clientWindow = parent->GetClientWindow();
-
-    wxCHECK_MSG( clientWindow, false, "Missing MDI client window." );
-
-    clientWindow->AddChild(this);
-
-    m_mdiParent = parent;
-    PreCreation();
-
-    int width = size.x;
-    int height = size.y;
-    if (width == -1)
-        width = 200; // TODO: give reasonable default
-    if (height == -1)
-        height = 200; // TODO: give reasonable default
-
-    // We're deactivating the old child
-    wxMDIChildFrame* oldActiveChild = parent->GetActiveChild();
-    if (oldActiveChild)
-    {
-        wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());
-        event.SetEventObject( oldActiveChild );
-        oldActiveChild->HandleWindowEvent(event);
-    }
-
-    // This is the currently active child
-    parent->SetActiveChild((wxMDIChildFrame*) this);
-
-    // This time we'll try a bog-standard bulletin board for
-    // 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);
-
-    XtAddEventHandler((Widget) m_mainWidget, ExposureMask,False,
-        wxUniversalRepaintProc, (XtPointer) this);
-
-    PostCreation();
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-
-    XtManageChild((Widget) m_mainWidget);
-
-    SetTitle(title);
-
-    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;
-}
-
-
-wxMDIChildFrame::~wxMDIChildFrame()
-{
-    if (m_mainWidget)
-      XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,False,
-        wxUniversalRepaintProc, (XtPointer) this);
-
-    if (GetMDIParentFrame())
-    {
-        wxMDIParentFrame* parentFrame = GetMDIParentFrame();
-
-        if (parentFrame->GetActiveChild() == this)
-            parentFrame->SetActiveChild(NULL);
-        wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();
-
-        // Remove page if still there
-        {
-            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)
-        {
-            wxMDIChildFrame* child = (wxMDIChildFrame*)  clientWindow->GetPage(0);
-            parentFrame->SetActiveChild(child);
-            parentFrame->SetChildMenuBar(child);
-        }
-        else
-        {
-            parentFrame->SetActiveChild(NULL);
-            parentFrame->SetChildMenuBar(NULL);
-        }
-    }
-}
-
-bool wxMDIChildFrame::Show(bool show)
-{
-    SetVisibleStatus( show );
-    return wxWindow::Show(show);
-}
-
-void wxMDIChildFrame::SetMenuBar(wxMenuBar *menuBar)
-{
-    // Don't create the underlying menubar yet; need to recreate
-    // it every time the child is activated.
-    m_frameMenuBar = menuBar;
-
-    // We make the assumption that if you're setting the menubar,
-    // this is the currently active child.
-    GetMDIParentFrame()->SetChildMenuBar(this);
-}
-
-void wxMDIChildFrame::SetTitle(const wxString& title)
-{
-    m_title = title;
-    wxMDIClientWindow* clientWindow = GetMDIParentFrame()->GetClientWindow();
-
-    int i = clientWindow->FindPage(this);
-    if (i != wxNOT_FOUND)
-        clientWindow->SetPageText(i, title);
-}
-
-void wxMDIChildFrame::Activate()
-{
-    // TODO
-}
-
-// Client window
-
-wxMDIClientWindow::~wxMDIClientWindow()
-{
-    // By the time this destructor is called, the child frames will have been
-    // deleted and removed from the notebook/client window.
-    DestroyChildren();
-
-    m_mainWidget = (WXWidget) 0;
-}
-
-bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
-{
-    SetWindowStyleFlag(style);
-
-    if ( !wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA,
-                             wxPoint(0, 0), wxSize(100, 100), 0) )
-        return false;
-
-    return true;
-}
-
-int wxMDIClientWindow::FindPage(const wxNotebookPage* page)
-{
-    for (int i = GetPageCount() - 1; i >= 0; --i)
-    {
-        if (GetPage(i) == page)
-            return i;
-    }
-
-    return -1;
-}
-
-void wxMDIClientWindow::OnPageChanged(wxBookCtrlEvent& event)
-{
-    // Notify child that it has been activated
-    if (event.GetOldSelection() != -1)
-    {
-        wxMDIChildFrame* oldChild = (wxMDIChildFrame*) GetPage(event.GetOldSelection());
-        if (oldChild)
-        {
-            wxActivateEvent event(wxEVT_ACTIVATE, false, oldChild->GetId());
-            event.SetEventObject( oldChild );
-            oldChild->HandleWindowEvent(event);
-        }
-    }
-    if (event.GetSelection() != -1)
-    {
-        wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
-        if (activeChild)
-        {
-            wxActivateEvent event(wxEVT_ACTIVATE, true, activeChild->GetId());
-            event.SetEventObject( activeChild );
-            activeChild->HandleWindowEvent(event);
-
-            if (activeChild->GetMDIParentFrame())
-            {
-                activeChild->GetMDIParentFrame()->SetActiveChild(activeChild);
-                activeChild->GetMDIParentFrame()->SetChildMenuBar(activeChild);
-            }
-        }
-    }
-    event.Skip();
-}