X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3281dbc1c102de5b2dc081392d1a315e0739b6a..2521c1ba6fb62fc01ab87a1346499baa19342fe9:/interface/wx/combobox.h

diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h
index c3ac2859d0..6dcefeebc2 100644
--- a/interface/wx/combobox.h
+++ b/interface/wx/combobox.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxComboBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -54,6 +54,17 @@
            Process a wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in
            the combobox (notice that the combobox must have been created with
            wxTE_PROCESS_ENTER style to receive this event).
+    @event{EVT_COMBOBOX_DROPDOWN(id, func)}
+           Process a wxEVT_COMMAND_COMBOBOX_DROPDOWN event, which is generated
+           when the list box part of the combo box is shown (drops down).
+           Notice that this event is currently only supported by wxMSW and
+           wxGTK with GTK+ 2.10 or later.
+    @event{EVT_COMBOBOX_CLOSEUP(id, func)}
+           Process a wxEVT_COMMAND_COMBOBOX_CLOSEUP event, which is generated
+           when the list box of the combo box disappears (closes up). This
+           event is only generated for the same platforms as
+           wxEVT_COMMAND_COMBOBOX_DROPDOWN above. Also note that only wxMSW
+           supports adding or deleting items in this event.
     @endEventTable
 
     @library{wxcore}
@@ -72,7 +83,6 @@ public:
     */
     wxComboBox();
 
-    //@{
     /**
         Constructor, creating and showing a combobox.
 
@@ -86,9 +96,10 @@ public:
             string must be one of the valid choices if it is not empty.
         @param pos
             Window position.
+            If ::wxDefaultPosition is specified then a default position is chosen.
         @param size
-            Window size. If wxDefaultSize is specified then the window is sized
-            appropriately.
+            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
@@ -105,6 +116,10 @@ public:
         arguments are to a single argument, which is a list of strings.
         @endWxPythonOnly
 
+        @beginWxPerlOnly
+        Not supported by wxPerl.
+        @endWxPerlOnly
+
         @see Create(), wxValidator
     */
     wxComboBox(wxWindow* parent, wxWindowID id,
@@ -144,6 +159,10 @@ public:
         arguments are to a single argument, which is a list of strings.
         @endWxPythonOnly
 
+        @beginWxPerlOnly
+        Use an array reference for the @a choices parameter.
+        @endWxPerlOnly
+
         @see Create(), wxValidator
     */
     wxComboBox(wxWindow* parent, wxWindowID id,
@@ -154,7 +173,6 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr);
-    //@}
 
     /**
         Destructor, destroying the combobox.
@@ -214,13 +232,40 @@ public:
     /**
         Sets the text for the combobox text field.
 
+        Notice that this method will generate a wxEVT_COMMAND_TEXT_UPDATED
+        event, use wxTextEntry::ChangeValue() if this is undesirable.
+
         @note For a combobox with @c wxCB_READONLY style the string must be in
               the combobox choices list, otherwise the call to SetValue() is
-              ignored.
+              ignored. This is case insensitive.
 
         @param text
             The text to set.
     */
     virtual void SetValue(const wxString& text);
+
+    /**
+        Shows the list box portion of the combo box.
+
+        Currently only implemented in wxMSW and wxGTK.
+
+        Notice that calling this function will generate a
+        wxEVT_COMMAND_COMBOBOX_DROPDOWN event.
+
+        @since 2.9.1
+    */
+    virtual void Popup();
+
+    /**
+        Hides the list box portion of the combo box.
+
+        Currently only implemented in wxMSW and wxGTK.
+
+        Notice that calling this function will generate a
+        wxEVT_COMMAND_COMBOBOX_CLOSEUP event.
+
+        @since 2.9.1
+    */
+    virtual void Dismiss();
 };