X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..831faf970a05e1710eac5663fd252da12a36992d:/include/wx/combobox.h diff --git a/include/wx/combobox.h b/include/wx/combobox.h index 2a7ffa1fab..cd19a9a503 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -59,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 @@ -75,8 +79,10 @@ public: #include "wx/msw/combobox.h" #elif defined(__WXMOTIF__) #include "wx/motif/combobox.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/combobox.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/combobox.h" #elif defined(__WXMAC__) #include "wx/mac/combobox.h" #elif defined(__WXCOCOA__)