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

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

diff --git a/interface/wx/choicebk.h b/interface/wx/choicebk.h
index 202747d1bcbdd0e44b30b156bf149464ffcb6a7a..ce4aae42c9cb13d03685c270868e1dc7c1ddb6a9 100644 (file)
--- a/interface/wx/choicebk.h
+++ b/interface/wx/choicebk.h
@@ -3,9 +3,21 @@
 // Purpose:     interface of wxChoicebook
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxChoicebook
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+
+// wxChoicebook flags
+#define wxCHB_DEFAULT          wxBK_DEFAULT
+#define wxCHB_TOP              wxBK_TOP
+#define wxCHB_BOTTOM           wxBK_BOTTOM
+#define wxCHB_LEFT             wxBK_LEFT
+#define wxCHB_RIGHT            wxBK_RIGHT
+#define wxCHB_ALIGN_MASK       wxBK_ALIGN_MASK
+
+wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
+wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;
+

 /**
     @class wxChoicebook
 
 /**
     @class wxChoicebook
 


@@ -35,7 +47,7 @@
            Place labels below the page area.
     @endStyleTable
 
            Place labels below the page area.
     @endStyleTable
 

-    @beginEventTable{wxBookCtrlEvent}
+    @beginEventEmissionTable{wxBookCtrlEvent}

     @event{EVT_CHOICEBOOK_PAGE_CHANGED(id, func)}
         The page selection was changed.
         Processes a @c wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED event.
     @event{EVT_CHOICEBOOK_PAGE_CHANGED(id, func)}
         The page selection was changed.
         Processes a @c wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED event.


@@ -46,8 +58,8 @@
     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}

-    @category{miscwnd}
-    @appearance{choicebook.png}
+    @category{bookctrl}
+    @appearance{choicebook}

 
     @see @ref overview_bookctrl, wxNotebook, @ref page_samples_notebook
 */
 
     @see @ref overview_bookctrl, wxNotebook, @ref page_samples_notebook
 */


@@ -63,9 +75,21 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,

-                 const wxString& name = wxEmptyStr);
+                 const wxString& name = wxEmptyString);

     //@}
 
     //@}
 

+    /**
+       Create the choicebook 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 wxChoice associated with the control.
     */
     /**
         Returns the wxChoice associated with the control.
     */