Window management and sizer layout corrections

[wxWidgets.git] / include / wx / generic / laywin.h

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index cc2f79ce8bded4650b355fd390e8ae3f1a91d0f9..7f8b13cb39b62e123bb6ca30b62aad4a78bc55af 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -9,7 +9,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LAYWIN_H_G_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LAYWIN_H_G_


@@ -19,22 +19,28 @@
 #pragma interface "laywin.h"
 #endif
 
 #pragma interface "laywin.h"
 #endif
 

-#include "wx/sashwin.h"
+#if wxUSE_SASH
+    #include "wx/sashwin.h"
+#endif // wxUSE_SASH

 
 

-const wxEventType wxEVT_QUERY_LAYOUT_INFO =     wxEVT_FIRST + 1500;
-const wxEventType wxEVT_CALCULATE_LAYOUT =      wxEVT_FIRST + 1501;
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO, 1500)
+    DECLARE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT, 1501)
+END_DECLARE_EVENT_TYPES()

 
 

-enum wxLayoutOrientation {
+enum wxLayoutOrientation
+{

     wxLAYOUT_HORIZONTAL,
     wxLAYOUT_VERTICAL
 };
 
     wxLAYOUT_HORIZONTAL,
     wxLAYOUT_VERTICAL
 };
 

-enum wxLayoutAlignment {
+enum wxLayoutAlignment
+{

     wxLAYOUT_NONE,
     wxLAYOUT_TOP,
     wxLAYOUT_LEFT,
     wxLAYOUT_RIGHT,
     wxLAYOUT_NONE,
     wxLAYOUT_TOP,
     wxLAYOUT_LEFT,
     wxLAYOUT_RIGHT,

-    wxLAYOUT_BOTTOM,
+    wxLAYOUT_BOTTOM

 };
 
 // Not sure this is necessary
 };
 
 // Not sure this is necessary


@@ -53,7 +59,7 @@ enum wxLayoutAlignment {
  * orientation and size.
  */
 
  * orientation and size.
  */
 

-class wxQueryLayoutInfoEvent: public wxEvent
+class WXDLLEXPORT wxQueryLayoutInfoEvent: public wxEvent

 {
 DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent)
 public:


@@ -67,22 +73,26 @@ public:
         m_alignment = wxLAYOUT_TOP;
         m_orientation = wxLAYOUT_HORIZONTAL;
     }
         m_alignment = wxLAYOUT_TOP;
         m_orientation = wxLAYOUT_HORIZONTAL;
     }

-// Read by the app
-    inline void SetRequestedLength(int length) { m_requestedLength = length; }
-    inline int GetRequestedLength() const { return m_requestedLength; }

 
 

-    inline void SetFlags(int flags) { m_flags = flags; }
-    inline int GetFlags() const { return m_flags; }
+    // Read by the app
+    void SetRequestedLength(int length) { m_requestedLength = length; }
+    int GetRequestedLength() const { return m_requestedLength; }
+
+    void SetFlags(int flags) { m_flags = flags; }
+    int GetFlags() const { return m_flags; }

 
 

-// Set by the app
-    inline void SetSize(const wxSize& size) { m_size = size; }
-    inline wxSize GetSize() const { return m_size; }
+    // Set by the app
+    void SetSize(const wxSize& size) { m_size = size; }
+    wxSize GetSize() const { return m_size; }

 
 

-    inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; }
-    inline wxLayoutOrientation GetOrientation() const { return m_orientation; }
+    void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; }
+    wxLayoutOrientation GetOrientation() const { return m_orientation; }
+
+    void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
+    wxLayoutAlignment GetAlignment() const { return m_alignment; }
+
+    virtual wxEvent *Clone() const { return new wxQueryLayoutInfoEvent(*this); }

 
 

-    inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
-    inline wxLayoutAlignment GetAlignment() const { return m_alignment; }

 protected:
     int                     m_flags;
     int                     m_requestedLength;
 protected:
     int                     m_flags;
     int                     m_requestedLength;


@@ -94,13 +104,14 @@ protected:
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
 
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
 

-#define EVT_QUERY_LAYOUT_INFO(func)  { wxEVT_QUERY_LAYOUT_INFO, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryLayoutInfoEventFunction) & func, NULL },
+#define EVT_QUERY_LAYOUT_INFO(func) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_LAYOUT_INFO, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryLayoutInfoEventFunction) & func, NULL ),

 
 /*
  * This event is used to take a bite out of the available client area.
  */
 
 
 /*
  * 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:
 {
 DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent)
 public:


@@ -108,15 +119,19 @@ public:
     {
         SetEventType(wxEVT_CALCULATE_LAYOUT);
         m_flags = 0;
     {
         SetEventType(wxEVT_CALCULATE_LAYOUT);
         m_flags = 0;

-       m_id = id;
+        m_id = id;

     }
     }

-// Read by the app
-    inline void SetFlags(int flags) { m_flags = flags; }
-    inline int GetFlags() const { return m_flags; }

 
 

-// Set by the app
-    inline void SetRect(const wxRect& rect) { m_rect = rect; }
-    inline wxRect GetRect() const { return m_rect; }
+    // Read by the app
+    void SetFlags(int flags) { m_flags = flags; }
+    int GetFlags() const { return m_flags; }
+
+    // Set by the app
+    void SetRect(const wxRect& rect) { m_rect = rect; }
+    wxRect GetRect() const { return m_rect; }
+
+    virtual wxEvent *Clone() const { return new wxCalculateLayoutEvent(*this); }
+

 protected:
     int                     m_flags;
     wxRect                  m_rect;
 protected:
     int                     m_flags;
     wxRect                  m_rect;


@@ -124,16 +139,30 @@ protected:
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
 
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
 

-#define EVT_CALCULATE_LAYOUT(func)  { wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL },
+#define EVT_CALCULATE_LAYOUT(func) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL ),
+
+#if wxUSE_SASH

 
 // 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.
 
 // 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:
 {
     DECLARE_CLASS(wxSashLayoutWindow)
 public:

+    wxSashLayoutWindow()
+    {
+        Init();
+    }
+

     wxSashLayoutWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
     wxSashLayoutWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,

+        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "layoutWindow")
+    {
+        Create(parent, id, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,

         const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "layoutWindow");
 
 // Accessors
         const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "layoutWindow");
 
 // Accessors


@@ -153,7 +182,10 @@ public:
 
     // Called by layout algorithm to retrieve information about the window.
     void OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event);
 
     // Called by layout algorithm to retrieve information about the window.
     void OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event);

-protected:
+
+private:
+    void Init();
+

     wxLayoutAlignment           m_alignment;
     wxLayoutOrientation         m_orientation;
     wxSize                      m_defaultSize;
     wxLayoutAlignment           m_alignment;
     wxLayoutOrientation         m_orientation;
     wxSize                      m_defaultSize;


@@ -161,20 +193,28 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

+#endif // wxUSE_SASH
+

 class WXDLLEXPORT wxMDIParentFrame;
 class WXDLLEXPORT wxFrame;
 
 // This class implements the layout algorithm
 class WXDLLEXPORT wxMDIParentFrame;
 class WXDLLEXPORT wxFrame;
 
 // This class implements the layout algorithm

-class wxLayoutAlgorithm: public wxObject
+class WXDLLEXPORT wxLayoutAlgorithm: public wxObject

 {
 public:
     wxLayoutAlgorithm() {}
 
 {
 public:
     wxLayoutAlgorithm() {}
 

+#if wxUSE_MDI_ARCHITECTURE

     // The MDI client window is sized to whatever's left over.
     // The MDI client window is sized to whatever's left over.

-    bool LayoutMDIFrame(wxMDIParentFrame* frame);
+    bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = (wxRect*) NULL);
+#endif // wxUSE_MDI_ARCHITECTURE
+
+    // mainWindow is sized to whatever's left over. This function for backward
+    // compatibility; use LayoutWindow.
+    bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow = (wxWindow*) NULL);

 
     // mainWindow is sized to whatever's left over.
 
     // mainWindow is sized to whatever's left over.

-    bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow);
+    bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = (wxWindow*) NULL);

 };
 
 #endif
 };
 
 #endif