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 627cc3bb50db5eadef8dbe842e7a3840ad8f63c6..15bc84a6992bf1d92a729d9781d4599aeab33ea0 100644 (file)
--- a/interface/wx/laywin.h
+++ b/interface/wx/laywin.h
@@ -2,7 +2,6 @@
 // Name:        laywin.h
 // Purpose:     interface of wxLayoutAlgorithm
 // Author:      wxWidgets team
 // Name:        laywin.h
 // Purpose:     interface of wxLayoutAlgorithm
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -92,10 +91,10 @@ enum wxLayoutAlignment
 
     @beginEventEmissionTable{wxQueryLayoutInfoEvent,wxCalculateLayoutEvent}
     @event{EVT_QUERY_LAYOUT_INFO(func)}
 
     @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)}
         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
 
         'bite' out of a rectangle provided by the algorithm. See wxCalculateLayoutEvent.
     @endEventTable
 


@@ -199,7 +198,7 @@ public:
         @param name
             Window name.
     */
         @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,
                        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)}
 
     @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
 
         from a window.
     @endEventTable
 


@@ -372,6 +371,8 @@ public:
 };
 
 
 };
 
 

+wxEventType wxEVT_QUERY_LAYOUT_INFO;
+

 
 /**
     @class wxCalculateLayoutEvent
 
 /**
     @class wxCalculateLayoutEvent


@@ -381,7 +382,7 @@ public:
 
     @beginEventTable{wxCalculateLayoutEvent}
     @event{EVT_CALCULATE_LAYOUT(func)}
 
     @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
 
         'bite' out of a rectangle provided by the algorithm.
     @endEventTable
 


@@ -425,3 +426,5 @@ public:
     void SetRect(const wxRect& rect);
 };
 
     void SetRect(const wxRect& rect);
 };
 

+wxEventType wxEVT_CALCULATE_LAYOUT;
+