X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8704bf74fba8523e2e174bd5a8195b5202009cd0..0ce742cf092c9244f27957e308c16f3c2631042d:/include/wx/motif/mdi.h

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index d3ee46079d..143596828a 100644
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -1,8 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mdi.h
 // Purpose:     MDI (Multiple Document Interface) classes.
-//              This doesn't have to be implemented just like Windows,
-//              it could be a tabbed design as in wxGTK.
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
@@ -18,7 +16,16 @@
 #pragma interface "mdi.h"
 #endif
 
+/*
+New MDI scheme using tabs. We can use a wxNotebook to implement the client
+window. wxMDIChildFrame can be implemented as an XmMainWindow widget
+as before, and is a child of the notebook _and_ of the parent frame...
+but wxMDIChildFrame::GetParent should return the parent frame.
+
+*/
+
 #include "wx/frame.h"
+#include "wx/notebook.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
@@ -26,9 +33,6 @@ WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 
-class XsMDICanvas;
-class wxXsMDIWindow;
-
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
 DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
@@ -68,12 +72,13 @@ public:
   // and status bar size have been subtracted. If you want to manage your own
   // toolbar(s), don't call SetToolBar.
   void GetClientSize(int *width, int *height) const;
+  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
 
-  // Get the active MDI child window (Windows only)
+  // Get the active MDI child window
   wxMDIChildFrame *GetActiveChild() const ;
 
   // Get the client window
-  inline wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; };
+  wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; };
 
   // Create the client window class (don't Create the window,
   // just return a new class)
@@ -86,9 +91,31 @@ public:
   virtual void ActivateNext();
   virtual void ActivatePrevious();
 
+// Implementation
+
+  // Set the active child
+  inline void SetActiveChild(wxMDIChildFrame* child) { m_activeChild = child; }
+
+  // Set the child's menubar into the parent frame
+  void SetChildMenuBar(wxMDIChildFrame* frame);
+
+  inline wxMenuBar* GetActiveMenuBar() const { return m_activeMenuBar; }
+
+  // Redirect events to active child first
+  virtual bool ProcessEvent(wxEvent& event);
+
+protected:
+  virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+  virtual void DoSetClientSize(int width, int height);
+
+
 protected:
 
-  wxMDIClientWindow     *m_clientWindow;
+  wxMDIClientWindow*    m_clientWindow;
+  wxMDIChildFrame*      m_activeChild;
+  wxMenuBar*            m_activeMenuBar;
 
 DECLARE_EVENT_TABLE()
 };
@@ -96,57 +123,82 @@ DECLARE_EVENT_TABLE()
 class WXDLLEXPORT wxMDIChildFrame: public wxFrame
 {
 DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-public:
-
-  wxMDIChildFrame();
-  inline 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);
-  }
-
-  ~wxMDIChildFrame();
 
-  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);
-
-  // Set menu bar
-  void SetMenuBar(wxMenuBar *menu_bar);
-  void SetTitle(const wxString& title);
-  void SetClientSize(int width, int height);
-  void GetClientSize(int *width, int *height) const;
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void GetSize(int *width, int *height) const;
-  void GetPosition(int *x, int *y) const ;
-
-  // Set icon
-  virtual void SetIcon(const wxIcon& icon);
-
-  // MDI operations
-  virtual void Maximize();
-  inline void Minimize() { Iconize(TRUE); };
-  virtual void Iconize(bool iconize);
-  virtual void Restore();
-  virtual void Activate();
-  virtual bool IsIconized() const ;
-
-  bool Show(bool show);
-  void BuildClientArea(WXWidget parent);
-  inline WXWidget GetTopWidget() const { return m_mainWidget; };
-  inline wxXsMDIWindow *GetMDIWindow() const { return m_mdiWindow; };
+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);
+    }
+
+    ~wxMDIChildFrame();
+
+    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);
+
+    // Set menu bar
+    void SetMenuBar(wxMenuBar *menu_bar);
+    void SetTitle(const wxString& title);
+
+    void GetClientSize(int *width, int *height) const;
+    void GetSize(int *width, int *height) const;
+    void GetPosition(int *x, int *y) const ;
+
+    // Set icon
+    virtual void SetIcon(const wxIcon& icon);
+
+    // Override wxFrame operations
+    void CaptureMouse();
+    void ReleaseMouse();
+    void Raise();
+    void Lower(void);
+    void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);
+
+    // 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 ;
+
+    // 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; };
+
+    /*
+       virtual void OnRaise();
+       virtual void OnLower();
+     */
+
+    void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
+    wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }
 
 protected:
-  wxXsMDIWindow*    m_mdiWindow ;
+    wxMDIParentFrame* m_mdiParentFrame;
+
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
 };
 
 /* The client window is a child of the parent MDI frame, and itself
@@ -156,43 +208,40 @@ protected:
  * of the children. Phew! So the children are sort of 'adopted'...
  */
 
-class WXDLLEXPORT wxMDIClientWindow: public wxWindow
+class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
 {
-  DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
- public:
-
-  wxMDIClientWindow() ;
-  inline wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
-  {
-      CreateClient(parent, style);
-  }
+DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 
-  ~wxMDIClientWindow();
-
-   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-   void SetClientSize(int width, int height);
-   void GetClientSize(int *width, int *height) const;
-
-   void GetSize(int *width, int *height) const ;
-   void GetPosition(int *x, int *y) const ;
+public:
+    wxMDIClientWindow() ;
+    wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
+    {
+        CreateClient(parent, style);
+    }
 
+    ~wxMDIClientWindow();
 
-  // Note: this is virtual, to allow overridden behaviour.
-  virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
+    void GetClientSize(int *width, int *height) const;
+    void GetSize(int *width, int *height) const ;
+    void GetPosition(int *x, int *y) const ;
 
-  // Explicitly call default scroll behaviour
-  void OnScroll(wxScrollEvent& event);
+    // Note: this is virtual, to allow overridden behaviour.
+    virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
 
-  inline XsMDICanvas* GetMDICanvas() const { return m_mdiCanvas; }
+    // Explicitly call default scroll behaviour
+    void OnScroll(wxScrollEvent& event);
 
-  WXWidget GetTopWidget() const { return m_topWidget; }
+    // Implementation
+    void OnPageChanged(wxNotebookEvent& event);
 
 protected:
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
 
-  XsMDICanvas*   m_mdiCanvas;
-  WXWidget       m_topWidget;
-
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 #endif