Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / interface / wx / laywin.h

diff --git a/interface/wx/laywin.h b/interface/wx/laywin.h
index 8256747bf4645c57a58a79ff29688d2a5b455a0f..15bc84a6992bf1d92a729d9781d4599aeab33ea0 100644 (file)
--- a/interface/wx/laywin.h
+++ b/interface/wx/laywin.h
@@ -2,8 +2,7 @@
 // Name:        laywin.h
 // Purpose:     interface of wxLayoutAlgorithm
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -90,12 +89,12 @@ enum wxLayoutAlignment
           It is an alternative way of specifying layouts for which the normal
           constraint system is unsuitable.
 
-    @beginEventTable{wxQueryLayoutInfoEvent,wxCalculateLayoutEvent}
+    @beginEventEmissionTable{wxQueryLayoutInfoEvent,wxCalculateLayoutEvent}
     @event{EVT_QUERY_LAYOUT_INFO(func)}
-        Process a wxEVT_QUERY_LAYOUT_INFO event, to get size, orientation and
+        Process a @c wxEVT_QUERY_LAYOUT_INFO event, to get size, orientation and
         alignment from a window. See wxQueryLayoutInfoEvent.
     @event{EVT_CALCULATE_LAYOUT(func)}
-        Process a wxEVT_CALCULATE_LAYOUT event, which asks the window to take a
+        Process a @c wxEVT_CALCULATE_LAYOUT event, which asks the window to take a
         'bite' out of a rectangle provided by the algorithm. See wxCalculateLayoutEvent.
     @endEventTable
 
@@ -106,7 +105,7 @@ enum wxLayoutAlignment
     @library{wxadv}
     @category{winlayout}
 
-    @see wxSashEvent, wxSashLayoutWindow, @ref overview_eventhandling
+    @see wxSashEvent, wxSashLayoutWindow, @ref overview_events
 */
 class wxLayoutAlgorithm : public wxObject
 {
@@ -169,7 +168,7 @@ public:
     @library{wxadv}
     @category{miscwnd}
 
-    @see wxLayoutAlgorithm, wxSashWindow, @ref overview_eventhandling
+    @see wxLayoutAlgorithm, wxSashWindow, @ref overview_events
 */
 class wxSashLayoutWindow : public wxSashWindow
 {
@@ -199,7 +198,7 @@ public:
         @param name
             Window name.
     */
-    wxSashLayoutWindow(wxSashLayoutWindow* parent, wxWindowID id,
+    wxSashLayoutWindow(wxWindow* parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxCLIP_CHILDREN | wxSW_3D,
@@ -225,7 +224,7 @@ public:
         @param name
             Window name.
     */
-    bool Create(wxSashLayoutWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxSW_3D,
@@ -294,7 +293,7 @@ public:
 
     @beginEventTable{wxQueryLayoutInfoEvent}
     @event{EVT_QUERY_LAYOUT_INFO(func)}
-        Process a wxEVT_QUERY_LAYOUT_INFO event, to get size, orientation and alignment
+        Process a @c wxEVT_QUERY_LAYOUT_INFO event, to get size, orientation and alignment
         from a window.
     @endEventTable
 
@@ -316,7 +315,7 @@ public:
         client area the window sticks to).
         One of wxLAYOUT_TOP, wxLAYOUT_LEFT, wxLAYOUT_RIGHT, wxLAYOUT_BOTTOM.
     */
-    void GetAlignment() const;
+    wxLayoutAlignment GetAlignment() const;
 
     /**
         Returns the flags associated with this event. Not currently used.
@@ -372,6 +371,8 @@ public:
 };
 
 
+wxEventType wxEVT_QUERY_LAYOUT_INFO;
+
 
 /**
     @class wxCalculateLayoutEvent
@@ -381,7 +382,7 @@ public:
 
     @beginEventTable{wxCalculateLayoutEvent}
     @event{EVT_CALCULATE_LAYOUT(func)}
-        Process a wxEVT_CALCULATE_LAYOUT event, which asks the window to take a
+        Process a @c wxEVT_CALCULATE_LAYOUT event, which asks the window to take a
         'bite' out of a rectangle provided by the algorithm.
     @endEventTable
 
@@ -425,3 +426,5 @@ public:
     void SetRect(const wxRect& rect);
 };
 
+wxEventType wxEVT_CALCULATE_LAYOUT;
+