Notebook, Listbox, and Checklst updates

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

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

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

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


@@ -38,9 +38,7 @@ class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:
     // all generic methods are in wxControlWithItems
 {
 public:
     // all generic methods are in wxControlWithItems

-#ifdef __WXMAC_X__
-    virtual ~wxChoiceBase() {}
-#endif
+    virtual ~wxChoiceBase();

 
     // single selection logic
     virtual void SetSelection(int n) = 0;
 
     // single selection logic
     virtual void SetSelection(int n) = 0;


@@ -56,21 +54,20 @@ public:
 
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);

-

 };
 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class definition
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class definition
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/choice.h"
+#elif defined(__WXMSW__)

     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/choice.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/choice.h"
     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/choice.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/choice.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/choice.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXPM__)