don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index feb94c7ffd1519856dae125ca39c13bc495789eb..16017f87ec36cc993b2e54820f1c35d6e6d32c69 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -40,6 +40,13 @@ public:
 
     // all generic methods are in wxControlWithItems
 
+    // get the current selection: this can only be different from the normal
+    // selection if the popup items list is currently opened and the user
+    // selected some item in it but didn't close the list yet; otherwise (and
+    // currently always on platforms other than MSW) this is the same as
+    // GetSelection()
+    virtual int GetCurrentSelection() const { return GetSelection(); }
+
     // set/get the number of columns in the control (as they're not supported on
     // most platforms, they do nothing by default)
     virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
@@ -64,8 +71,10 @@ private:
     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/choice.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/choice.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXCOCOA__)
@@ -76,5 +85,4 @@ private:
 
 #endif // wxUSE_CHOICE
 
-#endif
-    // _WX_CHOICE_H_BASE_
+#endif // _WX_CHOICE_H_BASE_