Applied wxPoem, wxSystemSettings, sizing, install doc patches

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

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 79111cd0e34de5c1ed7d8922f93bdda2849f8a4c..7f8b13cb39b62e123bb6ca30b62aad4a78bc55af 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -23,8 +23,10 @@
     #include "wx/sashwin.h"
 #endif // wxUSE_SASH
 
     #include "wx/sashwin.h"
 #endif // wxUSE_SASH
 

-extern const int wxEVT_QUERY_LAYOUT_INFO;
-extern const int wxEVT_CALCULATE_LAYOUT;
+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
 {


@@ -89,6 +91,8 @@ public:
     void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
     wxLayoutAlignment GetAlignment() const { return m_alignment; }
 
     void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
     wxLayoutAlignment GetAlignment() const { return m_alignment; }
 

+    virtual wxEvent *Clone() const { return new wxQueryLayoutInfoEvent(*this); }
+

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


@@ -101,7 +105,7 @@ protected:
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
 
 #define EVT_QUERY_LAYOUT_INFO(func) \
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
 
 #define EVT_QUERY_LAYOUT_INFO(func) \

-    wxEventTableEntry( wxEVT_QUERY_LAYOUT_INFO, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryLayoutInfoEventFunction) & func, NULL ),
+    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.


@@ -117,13 +121,17 @@ public:
         m_flags = 0;
         m_id = id;
     }
         m_flags = 0;
         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;


@@ -132,7 +140,7 @@ protected:
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
 
 #define EVT_CALCULATE_LAYOUT(func) \
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
 
 #define EVT_CALCULATE_LAYOUT(func) \

-    wxEventTableEntry( wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL ),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL ),

 
 #if wxUSE_SASH
 
 
 #if wxUSE_SASH
 


@@ -196,15 +204,14 @@ class WXDLLEXPORT wxLayoutAlgorithm: public wxObject
 public:
     wxLayoutAlgorithm() {}
 
 public:
     wxLayoutAlgorithm() {}
 

+#if wxUSE_MDI_ARCHITECTURE

     // The MDI client window is sized to whatever's left over.
     bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = (wxRect*) NULL);
     // The MDI client window is sized to whatever's left over.
     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.
 
     // 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);
-    }
+    bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow = (wxWindow*) NULL);

 
     // mainWindow is sized to whatever's left over.
     bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = (wxWindow*) NULL);
 
     // mainWindow is sized to whatever's left over.
     bool LayoutWindow(wxWindow* frame, wxWindow* mainWindow = (wxWindow*) NULL);