X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f1d2182ffe4feb82a1e674266f47d172ed3cb3c..e5ef1cae0f424be0bffbd651cb10052dfb208396:/interface/bmpcbox.h?ds=sidebyside

diff --git a/interface/bmpcbox.h b/interface/bmpcbox.h
index 44f867b817..3e7b6d87e1 100644
--- a/interface/bmpcbox.h
+++ b/interface/bmpcbox.h
@@ -19,15 +19,16 @@
     be derived from that class. In fact, if the platform does not have a native
     implementation, wxBitmapComboBox will inherit from wxOwnerDrawnComboBox.
     You can determine if the implementation is generic by checking whether
-    @c wxGENERIC_BITMAPCOMBOBOX is defined.
+    @c wxGENERIC_BITMAPCOMBOBOX is defined. Currently wxBitmapComboBox is
+    implemented natively for MSW and GTK+.
 
     @beginStyleTable
-    @style{wxCB_READONLY}:
+    @style{wxCB_READONLY}
            Creates a combobox without a text editor. On some platforms the
            control may appear very different when this style is used.
-    @style{wxCB_SORT}:
+    @style{wxCB_SORT}
            Sorts the entries in the list alphabetically.
-    @style{wxTE_PROCESS_ENTER}:
+    @style{wxTE_PROCESS_ENTER}
            The control will generate the event wxEVT_COMMAND_TEXT_ENTER
            (otherwise pressing Enter key is either processed internally by the
            control or used for navigation between dialog controls).
@@ -37,19 +38,19 @@
     @todo create wxCB_PROCESS_ENTER rather than reusing wxTE_PROCESS_ENTER!
 
     @beginEventTable{wxCommandEvent}
-    @event{EVT_COMBOBOX(id, func)}:
+    @event{EVT_COMBOBOX(id, func)}
            Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on
            the list is selected.
-    @event{EVT_TEXT(id, func)}:
+    @event{EVT_TEXT(id, func)}
            Process a wxEVT_COMMAND_TEXT_UPDATED event, when the combobox text changes.
-    @event{EVT_TEXT_ENTER(id, func)}:
+    @event{EVT_TEXT_ENTER(id, func)}
            Process a wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in
            the combobox.
     @endEventTable
 
     @library{wxadv}
     @category{ctrl}
-    @appearance{bitmapcombobox.png}
+    <!-- @appearance{bitmapcombobox.png} -->
 
     @see wxComboBox, wxChoice, wxOwnerDrawnComboBox, wxCommandEvent
 */
@@ -61,7 +62,6 @@ public:
     */
     wxBitmapComboBox();
 
-    //@{
     /**
         Constructor, creating and showing a combobox.
 
@@ -71,21 +71,10 @@ public:
             Window identifier. The value wxID_ANY indicates a default value.
         @param value
             Initial selection string. An empty string indicates no selection.
-        @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 wxBitmapComboBox.
-        @param validator
-            Window validator.
-        @param name
-            Window name.
 
         @see Create(), wxValidator
     */
@@ -98,6 +87,21 @@ public:
                      long style = 0,
                      const wxValidator& validator = wxDefaultValidator,
                      const wxString& name = "comboBox");
+
+    /**
+        Constructor, creating and showing a combobox.
+
+        @param parent
+            Parent window. Must not be @NULL.
+        @param id
+            Window identifier. The value wxID_ANY indicates a default value.
+        @param value
+            Initial selection string. An empty string indicates no selection.
+        @param choices
+            An wxArrayString with which to initialise the control.
+
+        @see Create(), wxValidator
+    */
     wxBitmapComboBox(wxWindow* parent, wxWindowID id,
                      const wxString& value,
                      const wxPoint& pos,
@@ -106,7 +110,6 @@ public:
                      long style = 0,
                      const wxValidator& validator = wxDefaultValidator,
                      const wxString& name = "comboBox");
-    //@}
 
     /**
         Destructor, destroying the combobox.
@@ -119,22 +122,22 @@ public:
     int Append(const wxString& item,
                const wxBitmap& bitmap = wxNullBitmap);
 
-    //@{
     /**
-        Adds the item to the end of the combo box, associating the given, typed or
+        Adds the item to the end of the combo box, associating the given
         untyped, client data pointer @a clientData with the item.
     */
     int Append(const wxString& item, const wxBitmap& bitmap,
                void* clientData);
+
+    /**
+        Adds the item to the end of the combo box, associating the given typed
+        client data pointer @a clientData with the item.
+    */
     int Append(const wxString& item, const wxBitmap& bitmap,
                wxClientData* clientData);
-    //@}
 
-    //@{
     /**
-        Creates the combobox for two-step construction. Derived classes
-        should call or replace this function. See wxBitmapComboBox()
-        for further details.
+        Creates the combobox for two-step construction.
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxString& value = "",
@@ -144,6 +147,10 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = "comboBox");
+
+    /**
+        Creates the combobox for two-step construction.
+    */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxString& value,
                 const wxPoint& pos,
@@ -152,7 +159,6 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = "comboBox");
-    //@}
 
     /**
         Returns size of bitmaps used in the list.
@@ -171,20 +177,23 @@ public:
     int Insert(const wxString& item, const wxBitmap& bitmap,
                unsigned int pos);
 
-    //@{
     /**
-        Inserts the item into the list before pos, associating the given, typed or
+        Inserts the item into the list before pos, associating the given
         untyped, client data pointer with the item.
         Not valid for @c wxCB_SORT style, use Append() instead.
     */
-
     int Insert(const wxString& item, const wxBitmap& bitmap,
                unsigned int pos,
                void* clientData);
+
+    /**
+        Inserts the item into the list before pos, associating the given typed
+        client data pointer with the item.
+        Not valid for @c wxCB_SORT style, use Append() instead.
+    */
     int Insert(const wxString& item, const wxBitmap& bitmap,
                unsigned int pos,
                wxClientData* clientData);
-    //@}
 
     /**
         Sets the bitmap for the given item.