removed redundant code

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index b0d2a7077069187a8ad13266628102b4aed3090f..6664996a0b9f94d20f887ab4f3b07ac749f45803 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -20,6 +20,8 @@
     #pragma interface "choicebase.h"
 #endif
 
     #pragma interface "choicebase.h"
 #endif
 

+#if wxUSE_CHOICE
+

 #include "wx/ctrlsub.h"     // the base class
 
 // ----------------------------------------------------------------------------
 #include "wx/ctrlsub.h"     // the base class
 
 // ----------------------------------------------------------------------------


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

+    virtual ~wxChoiceBase();

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


@@ -51,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__)


@@ -74,5 +76,7 @@ public:
     #include "wx/stubs/choice.h"
 #endif
 
     #include "wx/stubs/choice.h"
 #endif
 

+#endif // wxUSE_CHOICE
+

 #endif
     // _WX_CHOICE_H_BASE_
 #endif
     // _WX_CHOICE_H_BASE_