Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/bookctrl.h b/interface/wx/bookctrl.h
index 2039da442d8a322d248a2bd3a1337c4054b306b9..450cd6d4eb2467769a7e8be8e955fa8d08b39470 100644 (file)
--- a/interface/wx/bookctrl.h
+++ b/interface/wx/bookctrl.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxBookCtrlBase
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxBookCtrlBase
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

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


@@ -23,7 +23,7 @@
     This is a pure virtual class so you cannot allocate it directly.
 
     @library{wxcore}
     This is a pure virtual class so you cannot allocate it directly.
 
     @library{wxcore}

-    @category{miscwnd}
+    @category{bookctrl}

 
     @see @ref overview_bookctrl
 */
 
     @see @ref overview_bookctrl
 */


@@ -168,7 +168,7 @@ public:
         This function behaves as SetSelection() but does @em not generate the
         page changing events.
 
         This function behaves as SetSelection() but does @em not generate the
         page changing events.
 

-        See @ref overview_eventhandling_prog for more information.
+        See @ref overview_events_prog for more information.

     */
     virtual int ChangeSelection(size_t page) = 0;
 
     */
     virtual int ChangeSelection(size_t page) = 0;
 


@@ -221,6 +221,10 @@ public:
 
     /**
         Adds a new page.
 
     /**
         Adds a new page.

+
+        The page must have the book control itself as the parent and must not
+        have been added to this control previously.
+

         The call to this function may generate the page changing events.
 
         @param page
         The call to this function may generate the page changing events.
 
         @param page


@@ -363,7 +367,7 @@ public:
     probably unnecessary to process both events at once.
 
     @library{wxcore}
     probably unnecessary to process both events at once.
 
     @library{wxcore}

-    @category{events}
+    @category{events,bookctrl}

 
     @see wxNotebook, wxListbook, wxChoicebook, wxTreebook, wxToolbook
 */
 
     @see wxNotebook, wxListbook, wxChoicebook, wxTreebook, wxToolbook
 */