added test for writing empty value to the config

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 41dc31feb69aaf11dc027268f84c0e20e0ead323..6858103d6e2b3f82e3d53868e4e53edaaf9e1147 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -24,7 +24,7 @@
 
 #include "wx/window.h"      // base class
 
 
 #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
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls


@@ -48,8 +48,8 @@ public:
     // get the control alignment (left/right/centre, top/bottom/centre)
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
 
     // 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
+#ifdef __DARWIN__
+    virtual ~wxControlBase() { }

 #endif
 
 protected:
 #endif
 
 protected: