Allow style to be specified for ScrolledMessageDialog

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 9decf2b7852a239780ae9bb6cf9058c87f8d6034..3a95d2eff07f967bf7a174b196894638f4a0d173 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "choicebase.h"
 #endif
 
@@ -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);
@@ -54,6 +56,9 @@ public:
 
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxChoiceBase)
 };
 
 // ----------------------------------------------------------------------------