Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.

[wxWidgets.git] / include / wx / univ / tglbtn.h

diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h
index 9b03805b5203775029c7633db749e67c9adc1f6f..7bb99bac8d3a37bb9a8ad4d1d190c1730d6f6c03 100644 (file)
--- a/include/wx/univ/tglbtn.h
+++ b/include/wx/univ/tglbtn.h
@@ -14,7 +14,7 @@
 
 #include "wx/button.h"
 
-extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxToggleButton: a push button
@@ -57,6 +57,8 @@ public:
     bool GetValue() const { return m_value; }
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // the current value
     bool m_value;