Fixed size problem due to wxMac window implementation difference

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 6b252d92a6b21811b3a3410a63e7c43fcb806a13..b6600e3592a3d8c2b1afecf8e6e0e3f68c48d7e3 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "choicebase.h"
 #endif
 
     #pragma interface "choicebase.h"
 #endif
 


@@ -37,9 +37,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:
 class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:

-    // all generic methods are in wxControlWithItems
+    wxChoiceBase() { }

     virtual ~wxChoiceBase();
 
     virtual ~wxChoiceBase();
 

+    // all generic methods are in wxControlWithItems
+

     // single selection logic
     virtual void SetSelection(int n) = 0;
     virtual bool SetStringSelection(const wxString& s);
     // 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); }
 
     // 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);
     // 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,6 +75,8 @@ public:
     #include "wx/gtk/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
     #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"
 #endif
 #elif defined(__WXPM__)
     #include "wx/os2/choice.h"
 #endif