added wxConvFileName which is a variable, not define as wxConvFile; added comments...

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 12bf96c6e06917a16bd4ce6a4930f84a9c69eb6e..ea08445c753215d5aca0bb996c5fbedd2cab96ea 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -20,6 +20,8 @@
     #pragma interface "choicebase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_CHOICE
 
 #include "wx/ctrlsub.h"     // the base class
@@ -42,12 +44,6 @@ public:
 
     // all generic methods are in wxControlWithItems
 
-    // single selection logic
-    virtual void SetSelection(int n) = 0;
-
-    // don't override this
-    virtual void Select(int n) { SetSelection(n); }
-
     // 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 ) { }