fixing wrong version commit

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

diff --git a/interface/wx/combo.h b/interface/wx/combo.h
index 25e1ef7756a92284afd855935f8852d8fc4c2c1c..4a67cd784da88ce310e0ed5e6a286aa9c5b156c1 100644 (file)
--- a/interface/wx/combo.h
+++ b/interface/wx/combo.h
@@ -304,10 +304,10 @@ struct wxComboCtrlFeatures
     @event{EVT_TEXT_ENTER(id, func)}
            Process a wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in
            the combo control.
-    @event{EVT_COMBOX_DROPDOWN(id, func)}
+    @event{EVT_COMBOBOX_DROPDOWN(id, func)}
            Process a wxEVT_COMMAND_COMBOBOX_DROPDOWN event, which is generated
            when the popup window is shown (drops down).
-    @event{EVT_COMBOX_CLOSEUP(id, func)}
+    @event{EVT_COMBOBOX_CLOSEUP(id, func)}
            Process a wxEVT_COMMAND_COMBOBOX_CLOSEUP event, which is generated
            when the popup window of the combo control disappears (closes up).
            You should avoid adding or deleting items in this event.
@@ -448,6 +448,15 @@ public:
     */
     static int GetFeatures();
 
+    /**
+        Returns the current hint string.
+
+        See SetHint() for more information about hints.
+
+        @since 2.9.1
+    */
+    virtual wxString GetHint() const;
+
     /**
         Returns the insertion point for the combo control's text field.
 
@@ -620,6 +629,18 @@ public:
     */
     void SetCustomPaintWidth(int width);
 
+    /**
+        Sets a hint shown in an empty unfocused combo control.
+
+        Notice that hints are known as <em>cue banners</em> under MSW or
+        <em>placeholder strings</em> under OS X.
+
+        @see wxTextEntry::SetHint()
+
+        @since 2.9.1
+    */
+    virtual void SetHint(const wxString& hint);
+
     /**
         Sets the insertion point in the text field.