X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6d7030871f1376e727902c93f5537165a305e08..306dfc2b3d49ca45445bdfb2164fe1eea45ab321:/include/wx/generic/laywin.h

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index fcfc87a53d..47182c627c 100644
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -53,7 +53,7 @@ enum wxLayoutAlignment {
  * orientation and size.
  */
 
-class wxQueryLayoutInfoEvent: public wxEvent
+class WXDLLEXPORT wxQueryLayoutInfoEvent: public wxEvent
 {
 DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)
 public:
@@ -63,6 +63,7 @@ public:
         SetEventType(wxEVT_QUERY_LAYOUT_INFO);
         m_requestedLength = 0;
         m_flags = 0;
+        m_id = id;
         m_alignment = wxLAYOUT_TOP;
         m_orientation = wxLAYOUT_HORIZONTAL;
     }
@@ -99,7 +100,7 @@ typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEv
  * This event is used to take a bite out of the available client area.
  */
 
-class wxCalculateLayoutEvent: public wxEvent
+class WXDLLEXPORT wxCalculateLayoutEvent: public wxEvent
 {
 DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent)
 public:
@@ -107,6 +108,7 @@ public:
     {
         SetEventType(wxEVT_CALCULATE_LAYOUT);
         m_flags = 0;
+	m_id = id;
     }
 // Read by the app
     inline void SetFlags(int flags) { m_flags = flags; }
@@ -127,7 +129,7 @@ typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEv
 // This is window that can remember alignment/orientation, does its own layout,
 // and can provide sashes too. Useful for implementing docked windows with sashes in
 // an IDE-style interface.
-class wxSashLayoutWindow: public wxSashWindow
+class WXDLLEXPORT wxSashLayoutWindow: public wxSashWindow
 {
     DECLARE_CLASS(wxSashLayoutWindow)
 public:
@@ -163,16 +165,23 @@ class WXDLLEXPORT wxMDIParentFrame;
 class WXDLLEXPORT wxFrame;
 
 // This class implements the layout algorithm
-class wxLayoutAlgorithm: public wxObject
+class WXDLLEXPORT wxLayoutAlgorithm: public wxObject
 {
 public:
     wxLayoutAlgorithm() {}
 
     // The MDI client window is sized to whatever's left over.
-    bool LayoutMDIFrame(wxMDIParentFrame* frame);
+    bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = (wxRect*) NULL);
 
-    // mainWindow is sized to whatever's left over.
-    bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow);
+    // mainWindow is sized to whatever's left over. This function for backward
+    // compatibility; use LayoutWindow.
+    bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow = (wxWindow*) NULL)
+    {
+        return LayoutWindow(frame, mainWindow);
+    }
+
+    // mainWindow is sized to whatever's left over. This function for backward
+    bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = (wxWindow*) NULL);
 };
 
 #endif