X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c7fe6f2209681ba6520217f0994435a98c82beb..7ace5fd8e03c5b49d672e0363a8d4960bbf80592:/interface/listbox.h

diff --git a/interface/listbox.h b/interface/listbox.h
index 8f5eb48ff0..eaf1d8e1a4 100644
--- a/interface/listbox.h
+++ b/interface/listbox.h
@@ -20,9 +20,8 @@
     List box elements are numbered from zero. Their number may be limited
     under some platforms.
 
-    A listbox callback gets an event wxEVT_COMMAND_LISTBOX_SELECTED for single
-    clicks, and
-    wxEVT_COMMAND_LISTBOX_DOUBLECLICKED for double clicks.
+    A listbox callback gets an event wxEVT_COMMAND_LISTBOX_SELECTED for
+    single clicks, and wxEVT_COMMAND_LISTBOX_DOUBLECLICKED for double clicks.
 
     @beginStyleTable
     @style{wxLB_SINGLE}
@@ -61,34 +60,20 @@
 class wxListBox : public wxControlWithItems
 {
 public:
-    //@{
     /**
-        Constructor, creating and showing a list box.
+        Default constructor.
+    */
+    wxListBox();
+    
+    /**
+        Constructor 
 
-        @param parent
-            Parent window. Must not be @NULL.
-        @param id
-            Window identifier. The value wxID_ANY indicates a default value.
-        @param pos
-            Window position.
-        @param size
-            Window size. If wxDefaultSize is specified then the window is
-        sized
-            appropriately.
         @param n
             Number of strings with which to initialise the control.
-        @param choices
-            An array of strings with which to initialise the control.
         @param style
             Window style. See wxListBox.
-        @param validator
-            Window validator.
-        @param name
-            Window name.
-
-        @see Create(), wxValidator
     */
-    wxListBox();
+    
     wxListBox(wxWindow* parent, wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
@@ -97,6 +82,16 @@ public:
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = "listBox");
+              
+    /**
+        Constructor 
+
+        @param choices
+            An array of strings with which to initialise the control.
+        @param style
+            Window style. See wxListBox.
+    */
+    
     wxListBox(wxWindow* parent, wxWindowID id,
               const wxPoint& pos,
               const wxSize& size,
@@ -104,7 +99,6 @@ public:
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = "listBox");
-    //@}
 
     /**
         Destructor, destroying the list box.
@@ -150,7 +144,7 @@ public:
             A reference to an wxArrayInt instance that is used to store the result of
         the query.
 
-        @returns The number of selections.
+        @return The number of selections.
 
         @remarks Use this with a multiple selection listbox.
 
@@ -168,14 +162,13 @@ public:
         @param point
             Point of item (in client coordinates) to obtain
 
-        @returns Item located at point, or wxNOT_FOUND if unimplemented or the
+        @return Item located at point, or wxNOT_FOUND if unimplemented or the
                  item does not exist.
 
         @since 2.7.0
     */
     int HitTest(const wxPoint point) const;
 
-    //@{
     /**
         Insert the given number of strings before the specified position.
 
@@ -184,15 +177,23 @@ public:
         @param items
             Labels of items to be inserted
         @param pos
-            Position before which to insert the items: for example, if pos is 0 the
-        items
-            will be inserted in the beginning of the listbox
+            Position before which to insert the items: if pos is 0 the
+            items will be inserted in the beginning of the listbox
     */
-    void InsertItems(int nItems, const wxString items,
+    void InsertItems(int nItems, const wxString *items,
                      unsigned int pos);
-    void InsertItems(const wxArrayString& nItems,
+
+    /**
+        Insert the given number of strings before the specified position.
+
+        @param items
+            Labels of items to be inserted
+        @param pos
+            Position before which to insert the items: if pos is 0 the
+            items will be inserted in the beginning of the listbox
+    */
+    void InsertItems(const wxArrayString& items,
                      unsigned int pos);
-    //@}
 
     /**
         Determines whether an item is selected.
@@ -200,11 +201,10 @@ public:
         @param n
             The zero-based item index.
 
-        @returns @true if the given item is selected, @false otherwise.
+        @return @true if the given item is selected, @false otherwise.
     */
     bool IsSelected(int n) const;
 
-    //@{
     /**
         Clears the list box and adds the given strings to it.
 
@@ -214,26 +214,36 @@ public:
             An array of strings to set.
         @param clientData
             Options array of client data pointers
+    */
+    void Set(int n, const wxString* choices, void **clientData = NULL);
 
-        @remarks You may free the array from the calling program after this
-                 function has been called.
+    /**
+        Clears the list box and adds the given strings to it. You may
+        free the array from the calling program after this method
+        has been called.
+
+        @param choices
+            An array of strings to set.
+        @param clientData
+            Options array of client data pointers
     */
-    void Set(int n, const wxString* choices, void clientData = NULL);
     void Set(const wxArrayString& choices,
-             void clientData = NULL);
-    //@}
+             void **clientData = NULL);
 
-    //@{
     /**
         Set the specified item to be the first visible item.
 
         @param n
-            The zero-based item index.
+            The zero-based item index that should be visible.
+    */
+    void SetFirstItem(int n);
+
+    /**
+        Set the specified item to be the first visible item.
+
         @param string
             The string that should be visible.
     */
-    void SetFirstItem(int n);
     void SetFirstItem(const wxString& string);
-    //@}
 };