X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/403aced8ed8e6e814f6979cc3d6988c7f731438d..158b668823e14d9b42c9e7fe0281d35924192c68:/include/wx/control.h?ds=sidebyside diff --git a/include/wx/control.h b/include/wx/control.h index fb90b4dbef..afbabb3ad7 100644 --- 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 __WXMAC_X__ - virtual ~wxControlBase() { } // Added min for Mac X -#endif - protected: // creates the control (calls wxWindowBase::CreateBase inside) and adds it // to the list of parents children @@ -82,8 +80,6 @@ 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__)