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 50cb783c6201aff2cec76680f9d37d15053e3171..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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -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,


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

+wxEventType wxEVT_QUERY_LAYOUT_INFO;
+

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


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

+wxEventType wxEVT_CALCULATE_LAYOUT;
+