warnings (and some errors) fixes for wxUniv DLL build

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index a5fdf70f1136d7ed56c921158973f3c774e78699..a86635b0807a1bf37c694524d59633fd9bdf75ad 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -37,9 +37,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:
-    // all generic methods are in wxControlWithItems
+    wxChoiceBase() { }
     virtual ~wxChoiceBase();
 
+    // all generic methods are in wxControlWithItems
+
     // single selection logic
     virtual void SetSelection(int n) = 0;
     virtual bool SetStringSelection(const wxString& s);
@@ -47,13 +49,16 @@ public:
     // don't override this
     virtual void Select(int n) { SetSelection(n); }
 
-    // set/get the number of columns in the control (as they're not supporte on
+    // 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 ) { }
     virtual int GetColumns() const { return 1 ; }
 
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxChoiceBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -70,10 +75,10 @@ public:
     #include "wx/gtk/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/choice.h"
 #elif defined(__WXPM__)
     #include "wx/os2/choice.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/choice.h"
 #endif
 
 #endif // wxUSE_CHOICE