avoid infinite recursion for richtooltops, (hopefully) fixes #15070

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

diff --git a/interface/wx/laywin.h b/interface/wx/laywin.h
index 852c635ac2d878c9f6d3cb33a398d030a12db191..7198e283bbf5c65a8004e15ddb6ead336b592a7b 100644 (file)
--- a/interface/wx/laywin.h
+++ b/interface/wx/laywin.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxLayoutAlgorithm
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxLayoutAlgorithm
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -90,12 +90,12 @@ enum wxLayoutAlignment
           It is an alternative way of specifying layouts for which the normal
           constraint system is unsuitable.
 
           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)}
     @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
 


@@ -106,7 +106,7 @@ enum wxLayoutAlignment
     @library{wxadv}
     @category{winlayout}
 
     @library{wxadv}
     @category{winlayout}
 

-    @see wxSashEvent, wxSashLayoutWindow, @ref overview_eventhandling
+    @see wxSashEvent, wxSashLayoutWindow, @ref overview_events

 */
 class wxLayoutAlgorithm : public wxObject
 {
 */
 class wxLayoutAlgorithm : public wxObject
 {


@@ -169,7 +169,7 @@ public:
     @library{wxadv}
     @category{miscwnd}
 
     @library{wxadv}
     @category{miscwnd}
 

-    @see wxLayoutAlgorithm, wxSashWindow, @ref overview_eventhandling
+    @see wxLayoutAlgorithm, wxSashWindow, @ref overview_events

 */
 class wxSashLayoutWindow : public wxSashWindow
 {
 */
 class wxSashLayoutWindow : public wxSashWindow
 {


@@ -199,7 +199,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 +294,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 +372,8 @@ public:
 };
 
 
 };
 
 

+wxEventType wxEVT_QUERY_LAYOUT_INFO;
+

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


@@ -381,7 +383,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 +427,5 @@ public:
     void SetRect(const wxRect& rect);
 };
 
     void SetRect(const wxRect& rect);
 };
 

+wxEventType wxEVT_CALCULATE_LAYOUT;
+