Upported combobox changes and another fix.

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 6858103d6e2b3f82e3d53868e4e53edaaf9e1147..f13b61e99dc899c0247560173279ff5f40d972fd 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "controlbase.h"
 #endif
 
@@ -33,6 +33,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:
+    virtual ~wxControlBase();
+
     // Create() function adds the validator parameter
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
@@ -48,10 +50,6 @@ public:
     // get the control alignment (left/right/centre, top/bottom/centre)
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
 
-#ifdef __DARWIN__
-    virtual ~wxControlBase() { }
-#endif
-
 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
@@ -82,14 +80,10 @@ protected:
     #include "wx/motif/control.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/control.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
 #elif defined(__WXPM__)
     #include "wx/os2/control.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/control.h"
 #endif
 
 #endif // wxUSE_CONTROLS