Applied patch #15286: documentation and col/rowspan demo by dghart

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

diff --git a/interface/wx/toolbook.h b/interface/wx/toolbook.h
index 96846cb262c99c58a425ed1456f2083e344004f7..67266e1bdd7495f21faa0afed94e241a2c4d411a 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_TOOLBOOK_PAGE_CHANGED;
+wxEventType wxEVT_TOOLBOOK_PAGE_CHANGING;
+
+
 /**
     @class wxToolbook
 
@@ -33,10 +40,10 @@
     @beginEventEmissionTable{wxBookCtrlEvent}
     @event{EVT_TOOLBOOK_PAGE_CHANGED(id, func)}
         The page selection was changed.
-        Processes a @c wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED event.
+        Processes a @c wxEVT_TOOLBOOK_PAGE_CHANGED event.
     @event{EVT_TOOLBOOK_PAGE_CHANGING(id, func)}
         The page selection is about to be changed.
-        Processes a @c wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING event.
+        Processes a @c wxEVT_TOOLBOOK_PAGE_CHANGING event.
         This event can be vetoed (using wxNotifyEvent::Veto()).
     @endEventTable
 
@@ -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.
     */