set eol-style

[wxWidgets.git] / include / wx / combobox.h

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index c4ce9f63dae0d1fd1a6a792fbb33a0abfeb9b904..cd19a9a5035a8edf4ce9333c5958983c024c0379 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -16,15 +16,6 @@
 
 #if wxUSE_COMBOBOX
 
-/*
- * wxComboBox style flags
- */
-#define wxCB_SIMPLE         0x0004
-#define wxCB_SORT           0x0008
-#define wxCB_READONLY       0x0010
-#define wxCB_DROPDOWN       0x0020
-#define wxCB_FILENAME       0x0040
-
 extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
@@ -68,6 +59,10 @@ public:
     virtual bool CanUndo() const = 0;
     virtual bool CanRedo() const = 0;
 
+    // may return value different from GetSelection() when the combobox
+    // dropdown is shown and the user selected, but not yet accepted, a value
+    // different from the old one in it
+    virtual int GetCurrentSelection() const { return GetSelection(); }
 
     // redeclare inherited SetSelection() overload here as well to avoid
     // virtual function hiding