Some more NanoX compile fixes

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 41dc31feb69aaf11dc027268f84c0e20e0ead323..24338b06b5dddc42ee2f220c32aa879b14bbd772 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -24,7 +24,7 @@
 
 #include "wx/window.h"      // base class
 
-extern const wxChar* wxControlNameStr; // the default name
+WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
@@ -33,6 +33,8 @@ extern const wxChar* wxControlNameStr; // the default name
 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__)