fixes to previous fixes for Sun's CC 5.0

[wxWidgets.git] / include / wx / motif / mdi.h

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index bcffddeb6bd316fb6867d76f6244958da7c63998..557f0044db8c1e889beb116180199115d41beba6 100644 (file)
--- 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.
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98


@@ -18,7 +16,16 @@
 #pragma interface "mdi.h"
 #endif
 
 #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/frame.h"

+#include "wx/notebook.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
 
 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 WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 

-class XsMDICanvas;
-class wxXsMDIWindow;
-

 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
 DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
 DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)


@@ -68,6 +72,7 @@ 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;
   // 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
   wxMDIChildFrame *GetActiveChild() const ;
 
   // Get the active MDI child window
   wxMDIChildFrame *GetActiveChild() const ;


@@ -87,12 +92,24 @@ public:
   virtual void ActivatePrevious();
 
 // Implementation
   virtual void ActivatePrevious();
 
 // Implementation

+
+  // Set the active child

   inline void SetActiveChild(wxMDIChildFrame* child) { m_activeChild = 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:
 
   wxMDIClientWindow*    m_clientWindow;
   wxMDIChildFrame*      m_activeChild;
 protected:
 
   wxMDIClientWindow*    m_clientWindow;
   wxMDIChildFrame*      m_activeChild;

+  wxMenuBar*            m_activeMenuBar;

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };


@@ -127,15 +144,34 @@ public:
   // Set menu bar
   void SetMenuBar(wxMenuBar *menu_bar);
   void SetTitle(const wxString& title);
   // Set menu bar
   void SetMenuBar(wxMenuBar *menu_bar);
   void SetTitle(const wxString& title);

+

   void SetClientSize(int width, int height);
   void SetClientSize(int width, int height);

+  void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
+

   void GetClientSize(int *width, int *height) const;
   void GetClientSize(int *width, int *height) const;

+  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
+

   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+  virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+

   void GetSize(int *width, int *height) const;
   void GetSize(int *width, int *height) const;

+  wxSize GetSize() const { return wxWindow::GetSize(); }
+

   void GetPosition(int *x, int *y) const ;
   void GetPosition(int *x, int *y) const ;

+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }

 
   // Set icon
   virtual void SetIcon(const wxIcon& icon);
 
 
   // 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();
   inline void Minimize() { Iconize(TRUE); };
   // MDI operations
   virtual void Maximize();
   inline void Minimize() { Iconize(TRUE); };


@@ -144,15 +180,26 @@ public:
   virtual void Activate();
   virtual bool IsIconized() const ;
 
   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);
   bool Show(bool show);

-  void BuildClientArea(WXWidget parent);
+
+  inline WXWidget GetMainWidget() const { return m_mainWidget; };

   inline WXWidget GetTopWidget() const { return m_mainWidget; };
   inline WXWidget GetTopWidget() const { return m_mainWidget; };

-  inline wxXsMDIWindow *GetMDIWindow() const { return m_mdiWindow; };
+  inline WXWidget GetClientWidget() const { return m_mainWidget; };
+
+/*

   virtual void OnRaise();
   virtual void OnLower();
   virtual void OnRaise();
   virtual void OnLower();

+*/
+
+  inline void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
+  inline wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }

 
 protected:
 
 protected:

-  wxXsMDIWindow*    m_mdiWindow ;
+  wxMDIParentFrame* m_mdiParentFrame;

 };
 
 /* The client window is a child of the parent MDI frame, and itself
 };
 
 /* The client window is a child of the parent MDI frame, and itself


@@ -162,7 +209,7 @@ protected:
  * of the children. Phew! So the children are sort of 'adopted'...
  */
 
  * 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:
 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
  public:


@@ -176,12 +223,21 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow
   ~wxMDIClientWindow();
 
    void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   ~wxMDIClientWindow();
 
    void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+   void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+   void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+

    void SetClientSize(int width, int height);
    void SetClientSize(int width, int height);

+   void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
+

    void GetClientSize(int *width, int *height) const;
    void GetClientSize(int *width, int *height) const;

+   wxSize GetClientSize() const { return wxWindow::GetClientSize(); }

 
    void GetSize(int *width, int *height) const ;
 
    void GetSize(int *width, int *height) const ;

-   void GetPosition(int *x, int *y) const ;
+   wxSize GetSize() const { return wxWindow::GetSize(); }

 
 

+   void GetPosition(int *x, int *y) const ;
+   wxPoint GetPosition() const { return wxWindow::GetPosition(); }

 
   // Note: this is virtual, to allow overridden behaviour.
   virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
 
   // Note: this is virtual, to allow overridden behaviour.
   virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);


@@ -189,15 +245,11 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow
   // Explicitly call default scroll behaviour
   void OnScroll(wxScrollEvent& event);
 
   // Explicitly call default scroll behaviour
   void OnScroll(wxScrollEvent& event);
 

-  inline XsMDICanvas* GetMDICanvas() const { return m_mdiCanvas; }
-
-  WXWidget GetTopWidget() const { return m_topWidget; }
+  // Implementation
+  void OnPageChanged(wxNotebookEvent& event);

 
 protected:
 
 
 protected:
 

-  XsMDICanvas*   m_mdiCanvas;
-  WXWidget       m_topWidget;
-

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };