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

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

diff --git a/interface/wx/toolbook.h b/interface/wx/toolbook.h
index b78c28c4a83bcd1204a07dc5eb0dc056dedfda72..630f8eca543cac8c4d07dffc622c472369c1614d 100644 (file)
--- a/interface/wx/toolbook.h
+++ b/interface/wx/toolbook.h
@@ -3,9 +3,16 @@
 // Purpose:     interface of wxToolbook
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define wxTBK_BUTTONBAR            0x0100
+#define wxTBK_HORZ_LAYOUT          0x8000
+
+wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED;
+wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING;
+
+
 /**
     @class wxToolbook
 
@@ -30,7 +37,7 @@
     The common wxBookCtrl styles described in the @ref overview_bookctrl are
     also supported.
 
-    @beginEventTable{wxBookCtrlEvent}
+    @beginEventEmissionTable{wxBookCtrlEvent}
     @event{EVT_TOOLBOOK_PAGE_CHANGED(id, func)}
         The page selection was changed.
         Processes a @c wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED event.
@@ -41,7 +48,7 @@
     @endEventTable
 
     @library{wxcore}
-    @category{miscwnd}
+    @category{bookctrl}
 
     @see @ref overview_bookctrl, wxBookCtrlBase, wxNotebook,
          @ref page_samples_notebook
@@ -58,9 +65,20 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = wxEmptyStr);
+                 const wxString& name = wxEmptyString);
     //@}
 
+    /**
+       Create the tool book control that has already been constructed with
+       the default constructor.
+    */
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxEmptyString);
+
     /**
         Returns the wxToolBarBase associated with the control.
     */