From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 Mar 2005 12:27:49 +0000 (+0000)
Subject: added orient parameter to wxMDIParentFrame::Tile()
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0d97c0902355bd73c080ebffa45ec809813df51d

added orient parameter to wxMDIParentFrame::Tile()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/changes.txt b/docs/changes.txt
index d56a29c43f..001575b604 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -30,6 +30,10 @@ Unix:
 
 - Fixed build on Linux/AMD64
 
+wxMSW:
+
+- Added "orient" parameter to wxMDIParentFrame::Tile()
+
 wxGTK:
 
 - Improved wxSystemSettings::GetMetric() to work better with X11. (Mart Raudsepp)
diff --git a/docs/latex/wx/mdi.tex b/docs/latex/wx/mdi.tex
index 1fba122918..f4ed04e303 100644
--- a/docs/latex/wx/mdi.tex
+++ b/docs/latex/wx/mdi.tex
@@ -545,9 +545,12 @@ To remove the window completely, use the wxFRAME\_NO\_WINDOW\_MENU window style.
 
 \membersection{wxMDIParentFrame::Tile}\label{wxmdiparentframetile}
 
-\func{void}{Tile}{\void}
+\func{void}{Tile}{\param{wxOrientation}{ orient = wxHORIZONTAL}}
 
-Tiles the MDI child windows.
+Tiles the MDI child windows either horizontally or vertically depending on
+whether \arg{orient} is wxHORIZONTAL or wxVERTICAL.
+
+Currently only implemented for MSW, does nothing under the other platforms.
 
 \wxheading{See also}
 
diff --git a/include/wx/cocoa/mdi.h b/include/wx/cocoa/mdi.h
index e2e3b6e772..b68ca4431a 100644
--- a/include/wx/cocoa/mdi.h
+++ b/include/wx/cocoa/mdi.h
@@ -83,7 +83,7 @@ public:
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}
-    virtual void Tile() {}
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {}
     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();
diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 6b7ea2b6da..187efb9802 100644
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -79,7 +79,7 @@ public:
     virtual wxGenericMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() { /* Has no effect */ }
-    virtual void Tile() { /* Has no effect */ }
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { }
     virtual void ArrangeIcons() { /* Has no effect */ }
     virtual void ActivateNext();
     virtual void ActivatePrevious();
diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index e261ea8d08..991610644e 100644
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -74,7 +74,7 @@ public:
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}
-    virtual void Tile() {}
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {}
     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();
diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index e261ea8d08..991610644e 100644
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -74,7 +74,7 @@ public:
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}
-    virtual void Tile() {}
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {}
     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();
diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h
index eb55fff2a1..863ff82e86 100644
--- a/include/wx/mac/carbon/mdi.h
+++ b/include/wx/mac/carbon/mdi.h
@@ -77,7 +77,7 @@ public:
 
   // MDI operations
   virtual void Cascade();
-  virtual void Tile();
+  virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL);
   virtual void ArrangeIcons();
   virtual void ActivateNext();
   virtual void ActivatePrevious();
diff --git a/include/wx/mac/classic/mdi.h b/include/wx/mac/classic/mdi.h
index 1e5145e7bc..319bcd9731 100644
--- a/include/wx/mac/classic/mdi.h
+++ b/include/wx/mac/classic/mdi.h
@@ -75,7 +75,7 @@ public:
 
   // MDI operations
   virtual void Cascade();
-  virtual void Tile();
+  virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL);
   virtual void ArrangeIcons();
   virtual void ActivateNext();
   virtual void ActivatePrevious();
diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index e6026188df..a4533d6237 100644
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -33,10 +33,10 @@ class WXDLLEXPORT wxMDIChildFrame;
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-        
+
         friend class WXDLLEXPORT wxMDIChildFrame;
 public:
-    
+
     wxMDIParentFrame();
     inline wxMDIParentFrame(wxWindow *parent,
         wxWindowID id,
@@ -48,9 +48,9 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
-    
+
     ~wxMDIParentFrame();
-    
+
     bool Create(wxWindow *parent,
         wxWindowID id,
         const wxString& title,
@@ -58,68 +58,68 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
         const wxString& name = wxFrameNameStr);
-    
+
     void OnSize(wxSizeEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);
-    
+
     void SetMenuBar(wxMenuBar *menu_bar);
-    
+
     // Get the active MDI child window
     wxMDIChildFrame *GetActiveChild() const ;
-    
+
     // Get the client window
     wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; };
-    
+
     // Create the client window class (don't Create the window,
     // just return a new class)
     virtual wxMDIClientWindow *OnCreateClient() ;
-    
+
     // MDI operations
     virtual void Cascade();
-    virtual void Tile();
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL);
     virtual void ArrangeIcons();
     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);
-    
+
     // Gets the size available for subwindows after menu size, toolbar size
     // and status bar size have been subtracted. If you want to manage your own
     // toolbar(s), don't call SetToolBar.
     void DoGetClientSize(int *width, int *height) const;
-    
+
 protected:
-    
+
     wxMDIClientWindow*    m_clientWindow;
     wxMDIChildFrame*      m_activeChild;
     wxMenuBar*            m_activeMenuBar;
-    
+
     DECLARE_EVENT_TABLE()
 };
 
 class WXDLLEXPORT wxMDIChildFrame: public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-        
+
 public:
     wxMDIChildFrame();
     wxMDIChildFrame(wxMDIParentFrame *parent,
@@ -132,9 +132,9 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
-    
+
     ~wxMDIChildFrame();
-    
+
     bool Create(wxMDIParentFrame *parent,
         wxWindowID id,
         const wxString& title,
@@ -142,11 +142,11 @@ public:
         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);
-    
+
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons );
@@ -157,7 +157,7 @@ public:
     void Raise();
     void Lower(void);
     void DoSetSizeHints(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)) { };
@@ -166,35 +166,35 @@ public:
     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; };
-    
+
     /*
     virtual void OnRaise();
     virtual void OnLower();
     */
-    
+
     void SetMDIParentFrame(wxMDIParentFrame* parentFrame) { m_mdiParentFrame = parentFrame; }
     wxMDIParentFrame* GetMDIParentFrame() const { return m_mdiParentFrame; }
-    
+
 protected:
     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);
-    
+
     void DoGetClientSize(int *width, int *height) const;
     void DoGetSize(int *width, int *height) const;
     void DoGetPosition(int *x, int *y) const ;
@@ -210,37 +210,37 @@ protected:
 class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
 {
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
-        
+
 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);
-    
+
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);
-    
+
     // Implementation
     void OnPageChanged(wxNotebookEvent& 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);
-    
+
     void DoGetClientSize(int *width, int *height) const;
     void DoGetSize(int *width, int *height) const ;
     void DoGetPosition(int *x, int *y) const ;
-    
+
 private:
     DECLARE_EVENT_TABLE()
 };
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index ec07025dd6..a5bdff00cb 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -74,7 +74,7 @@ public:
     // MDI operations
     // --------------
     virtual void Cascade();
-    virtual void Tile();
+    virtual void Tile(wxOrientation orient = wxHORIZONTAL);
     virtual void ArrangeIcons();
     virtual void ActivateNext();
     virtual void ActivatePrevious();
diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index c9798d0151..7ee87f7acd 100644
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -212,7 +212,7 @@ void wxMDIParentFrame::Cascade()
     // TODO
 }
 
-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation WXUNUSED(orient))
 {
     // TODO
 }
diff --git a/src/mac/classic/mdi.cpp b/src/mac/classic/mdi.cpp
index add9482e11..bce41781f0 100644
--- a/src/mac/classic/mdi.cpp
+++ b/src/mac/classic/mdi.cpp
@@ -213,7 +213,7 @@ void wxMDIParentFrame::Cascade()
     // TODO
 }
 
-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation WXUNUSED(orient))
 {
     // TODO
 }
diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 1dd473c76e..01baaecd93 100644
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -277,7 +277,7 @@ void wxMDIParentFrame::Cascade()
     // TODO
 }
 
-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation WXUNUSED(orient))
 {
     // TODO
 }
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index be4d08a41b..3c93df9cc9 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -384,10 +384,14 @@ void wxMDIParentFrame::Cascade()
     ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDICASCADE, 0, 0);
 }
 
-// TODO: add a direction argument (hor/vert)
-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation orient)
 {
-    ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE, MDITILE_HORIZONTAL, 0);
+    wxASSERT_MSG( orient == wxHORIZONTAL || orient == wxVERTICAL,
+                  _T("invalid orientation value") );
+
+    ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE,
+                  orient == wxHORIZONTAL ? MDITILE_HORIZONTAL
+                                         : MDITILE_VERTICAL, 0);
 }
 
 void wxMDIParentFrame::ArrangeIcons()