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

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

diff --git a/interface/wx/listbook.h b/interface/wx/listbook.h
index eda83765d07caa21f821c51f244ab39af5928155..860bf93236f126b3ce67f9d46511504a835e7bc8 100644 (file)
--- a/interface/wx/listbook.h
+++ b/interface/wx/listbook.h
@@ -3,9 +3,20 @@
 // Purpose:     interface of wxListbook
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// wxListbook flags
+#define wxLB_DEFAULT          wxBK_DEFAULT
+#define wxLB_TOP              wxBK_TOP
+#define wxLB_BOTTOM           wxBK_BOTTOM
+#define wxLB_LEFT             wxBK_LEFT
+#define wxLB_RIGHT            wxBK_RIGHT
+#define wxLB_ALIGN_MASK       wxBK_ALIGN_MASK
+
+wxEventType wxEVT_LISTBOOK_PAGE_CHANGED;
+wxEventType wxEVT_LISTBOOK_PAGE_CHANGING;
+
 /**
     @class wxListbook
 
@@ -34,19 +45,19 @@
            Place labels below the page area.
     @endStyleTable
 
-    @beginEventTable{wxBookCtrlEvent}
+    @beginEventEmissionTable{wxBookCtrlEvent}
     @event{EVT_LISTBOOK_PAGE_CHANGED(id, func)}
         The page selection was changed.
-        Processes a @c wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED event.
+        Processes a @c wxEVT_LISTBOOK_PAGE_CHANGED event.
     @event{EVT_LISTBOOK_PAGE_CHANGING(id, func)}
         The page selection is about to be changed.
-        Processes a @c wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING event.
+        Processes a @c wxEVT_LISTBOOK_PAGE_CHANGING event.
         This event can be vetoed.
     @endEventTable
 
     @library{wxcore}
-    @category{miscwnd}
-    @appearance{listbook.png}
+    @category{bookctrl}
+    @appearance{listbook}
 
     @see wxBookCtrl, wxNotebook, @ref page_samples_notebook
 */
@@ -65,7 +76,18 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
-               const wxString& name = wxEmptyStr);
+               const wxString& name = wxEmptyString);
+
+    /**
+       Create the list 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 wxListView associated with the control.